Bug 1214305 - Part 5: Use the secure upgraded channel URI in FetchEventRunnable::Init; r=jdm
☠☠ backed out by c315a91b6edb ☠ ☠
authorEhsan Akhgari <ehsan@mozilla.com>
Mon, 02 Nov 2015 11:27:00 -0500
changeset 278321 100f8e24900720858a485cfb9f86d35538401b41
parent 278320 a59c453192dce3e7a6d79b9d8e5be3f96c03ccb1
child 278322 fba4a5bcea4172e7652fd4a3ecfa3cdfb9a3dde9
push id69729
push usereakhgari@mozilla.com
push dateMon, 04 Jan 2016 14:53:05 +0000
treeherdermozilla-inbound@1f482566235a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm
bugs1214305
milestone46.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 1214305 - Part 5: Use the secure upgraded channel URI in FetchEventRunnable::Init; r=jdm This ensures that FetchEvent.request.url will have the correct value for secure upgraded channels.
dom/workers/ServiceWorkerPrivate.cpp
--- a/dom/workers/ServiceWorkerPrivate.cpp
+++ b/dom/workers/ServiceWorkerPrivate.cpp
@@ -1047,17 +1047,17 @@ public:
   Init()
   {
     AssertIsOnMainThread();
     nsCOMPtr<nsIChannel> channel;
     nsresult rv = mInterceptedChannel->GetChannel(getter_AddRefs(channel));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIURI> uri;
-    rv = channel->GetURI(getter_AddRefs(uri));
+    rv = mInterceptedChannel->GetSecureUpgradedChannelURI(getter_AddRefs(uri));
     NS_ENSURE_SUCCESS(rv, rv);
 
     rv = uri->GetSpec(mSpec);
     NS_ENSURE_SUCCESS(rv, rv);
 
     uint32_t loadFlags;
     rv = channel->GetLoadFlags(&loadFlags);
     NS_ENSURE_SUCCESS(rv, rv);