Bug 1288915 P1 Make nsExternalAppHandler respect existing channel App…

…lyConversion flag. r=jdm
iaxat · Jul 28, 2016 · 9d6dca3 · 9d6dca3
1 parent cac3cad
commit 9d6dca3
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -1569,6 +1569,13 @@ nsExternalAppHandler::MaybeApplyDecodingForExtension(nsIRequest *aRequest)
   // Turn off content encoding conversions if needed
   bool applyConversion = true;
 
+  // First, check to see if conversion is already disabled.  If so, we
+  // have nothing to do here.
+  encChannel->GetApplyConversion(&applyConversion);
+  if (!applyConversion) {
+    return;
+  }
+
   nsCOMPtr<nsIURL> sourceURL(do_QueryInterface(mSourceUrl));
   if (sourceURL)
   {