Skip to content

Commit d859c29

Browse files
committed
Backed out changeset 28b2b5bfbed5 (bug 1885949) for causing http related mochitest failures CLOSED TREE
1 parent a8bf614 commit d859c29

File tree

8 files changed

+3
-102
lines changed

8 files changed

+3
-102
lines changed

dom/base/Document.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@
200200
#include "mozilla/dom/NetErrorInfoBinding.h"
201201
#include "mozilla/dom/NodeInfo.h"
202202
#include "mozilla/dom/NodeIterator.h"
203-
#include "mozilla/dom/nsHTTPSOnlyUtils.h"
204203
#include "mozilla/dom/PContentChild.h"
205204
#include "mozilla/dom/PWindowGlobalChild.h"
206205
#include "mozilla/dom/PageTransitionEvent.h"

dom/security/nsHTTPSOnlyUtils.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -902,13 +902,6 @@ bool nsHTTPSOnlyUtils::IsEqualURIExceptSchemeAndRef(nsIURI* aHTTPSSchemeURI,
902902

903903
return uriEquals;
904904
}
905-
906-
/* static */
907-
uint32_t nsHTTPSOnlyUtils::GetStatusForSubresourceLoad(
908-
uint32_t aHttpsOnlyStatus) {
909-
return aHttpsOnlyStatus & ~nsILoadInfo::HTTPS_ONLY_UPGRADED_HTTPS_FIRST;
910-
}
911-
912905
/////////////////////////////////////////////////////////////////////
913906
// Implementation of TestHTTPAnswerRunnable
914907

dom/security/nsHTTPSOnlyUtils.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,18 +164,6 @@ class nsHTTPSOnlyUtils {
164164
nsIURI* aOtherURI,
165165
nsILoadInfo* aLoadInfo);
166166

167-
/**
168-
* Determines which HTTPS-Only status flags should get propagated to
169-
* sub-resources or sub-documents. As sub-resources and sub-documents are
170-
* exempt when the top-level document is exempt, we need to copy the "exempt"
171-
* flag. The HTTPS-First "upgraded" flag should not be copied to prevent a
172-
* unwanted downgrade (Bug 1885949).
173-
* @param aHttpsOnlyStatus The HTTPS-Only status of the top-level document.
174-
* @return The HTTPS-Only status that the sub-resource/document should
175-
* receive.
176-
*/
177-
static uint32_t GetStatusForSubresourceLoad(uint32_t aHttpsOnlyStatus);
178-
179167
private:
180168
/**
181169
* Checks if it can be ruled out that the error has something

dom/security/test/https-first/browser.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ support-files = [
4040
["browser_navigation.js"]
4141
support-files = ["file_navigation.html"]
4242

43-
["browser_subdocument_downgrade.js"]
44-
support-files = [
45-
"file_empty.html",
46-
"file_subdocument_downgrade.sjs",
47-
]
48-
4943
["browser_schemeless.js"]
5044

5145
["browser_slow_download.js"]

dom/security/test/https-first/browser_subdocument_downgrade.js

Lines changed: 0 additions & 60 deletions
This file was deleted.

dom/security/test/https-first/file_empty.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

dom/security/test/https-first/file_subdocument_downgrade.sjs

Lines changed: 0 additions & 8 deletions
This file was deleted.

netwerk/base/LoadInfo.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "mozilla/dom/ToJSValue.h"
2121
#include "mozilla/dom/BrowsingContext.h"
2222
#include "mozilla/dom/WindowGlobalParent.h"
23-
#include "mozilla/dom/nsHTTPSOnlyUtils.h"
2423
#include "mozilla/net/CookieJarSettings.h"
2524
#include "mozilla/NullPrincipal.h"
2625
#include "mozilla/StaticPrefs_network.h"
@@ -217,9 +216,8 @@ LoadInfo::LoadInfo(
217216
mDocumentHasUserInteracted =
218217
aLoadingContext->OwnerDoc()->UserHasInteracted();
219218

220-
// Inherit HTTPS-Only Mode flags from parent document.
221-
mHttpsOnlyStatus |= nsHTTPSOnlyUtils::GetStatusForSubresourceLoad(
222-
aLoadingContext->OwnerDoc()->HttpsOnlyStatus());
219+
// Inherit HTTPS-Only Mode flags from parent document
220+
mHttpsOnlyStatus |= aLoadingContext->OwnerDoc()->HttpsOnlyStatus();
223221

224222
// When the element being loaded is a frame, we choose the frame's window
225223
// for the window ID and the frame element's window as the parent
@@ -530,9 +528,7 @@ LoadInfo::LoadInfo(dom::WindowGlobalParent* aParentWGP,
530528
parentBC->UsePrivateBrowsing());
531529
}
532530

533-
// Inherit HTTPS-Only Mode flags from embedder document.
534-
mHttpsOnlyStatus |= nsHTTPSOnlyUtils::GetStatusForSubresourceLoad(
535-
aParentWGP->HttpsOnlyStatus());
531+
mHttpsOnlyStatus |= aParentWGP->HttpsOnlyStatus();
536532

537533
// For chrome BC, the mPrivateBrowsingId remains 0 even its
538534
// UsePrivateBrowsing() is true, so we only update the mPrivateBrowsingId in

0 commit comments

Comments
 (0)