author | Mike de Boer <mdeboer@mozilla.com> |
Tue, 10 Oct 2017 19:14:01 +0200 | |
changeset 385348 | 4c86b1f93b8482ea3097a4edb51bb8c0e8dc67fc |
parent 385347 | 5a90656e4da6b9d2979f77fc12a911b0b894bef0 |
child 385349 | f580e00e8f62b7c53844d97948b396e6a1752f7f |
push id | 32652 |
push user | archaeopteryx@coole-files.de |
push date | Tue, 10 Oct 2017 21:49:31 +0000 |
treeherder | mozilla-central@f1ecd5c26948 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mconley |
bugs | 1397989 |
milestone | 58.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/toolkit/modules/RemoteWebProgress.jsm +++ b/toolkit/modules/RemoteWebProgress.jsm @@ -217,17 +217,21 @@ RemoteWebProgressManager.prototype = { if (json.requestURI) { request = new RemoteWebProgressRequest(json.requestURI, json.originalRequestURI, objects.request); } if (isTopLevel) { this._browser._contentWindow = objects.contentWindow; - this._browser._documentContentType = json.documentContentType; + // Setting a content-type back to `null` is quite nonsensical for the + // frontend, especially since we're not expecting it. + if (json.documentContentType !== null) { + this._browser._documentContentType = json.documentContentType; + } if (typeof json.inLoadURI != "undefined") { this._browser.inLoadURI = json.inLoadURI; } if (json.charset) { this._browser._characterSet = json.charset; this._browser._mayEnableCharacterEncodingMenu = json.mayEnableCharacterEncodingMenu; } }