Bug 1468340 P2 Don't unconditionally set LOAD_BYPASS_SERVICE_WORKER in HttpChannelParent for non-synthesized channels. r=valentin
authorBen Kelly <ben@wanderview.com>
Wed, 13 Jun 2018 06:41:47 -0700
changeset 479148 f1c3ce3f10c3c93b0dd5e7dba98b3f602b82279f
parent 479147 76231d6bf6e69b12116808b0368df298e5f91104
child 479149 27da7e98059ba703ea66ecd3f020516374887ff5
push id1757
push userffxbld-merge
push dateFri, 24 Aug 2018 17:02:43 +0000
treeherdermozilla-release@736023aebdb1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvalentin
bugs1468340
milestone62.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
Bug 1468340 P2 Don't unconditionally set LOAD_BYPASS_SERVICE_WORKER in HttpChannelParent for non-synthesized channels. r=valentin
netwerk/protocol/http/HttpChannelParent.cpp
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -593,21 +593,16 @@ HttpChannelParent::DoAsyncOpen(  const U
     httpChannelImpl->SetCouldBeSynthesized();
 
     if (!aSecurityInfoSerialization.IsEmpty()) {
       nsCOMPtr<nsISupports> secInfo;
       NS_DeserializeObject(aSecurityInfoSerialization, getter_AddRefs(secInfo));
       rv = httpChannel->OverrideSecurityInfo(secInfo);
       MOZ_ASSERT(NS_SUCCEEDED(rv));
     }
-  } else if (!ServiceWorkerParentInterceptEnabled()) {
-    nsLoadFlags newLoadFlags;
-    httpChannel->GetLoadFlags(&newLoadFlags);
-    newLoadFlags |= nsIChannel::LOAD_BYPASS_SERVICE_WORKER;
-    httpChannel->SetLoadFlags(newLoadFlags);
   }
 
   nsCOMPtr<nsICacheInfoChannel> cacheChannel =
     do_QueryInterface(static_cast<nsIChannel*>(httpChannel.get()));
   if (cacheChannel) {
     cacheChannel->SetCacheKey(aCacheKey);
     cacheChannel->PreferAlternativeDataType(aPreferredAlternativeType);