Bug 1154426 - Ignore gzip problems if only soft-enforcing. r=mcmanus
☠☠ backed out by 51d8f7a15a37 ☠ ☠
authorDaniel Stenberg <daniel@haxx.se>
Mon, 20 Apr 2015 07:27:00 -0400
changeset 271917 78aab1149276bd155c64e4216bd12d561abe3372
parent 271916 c214d74afc787e5557d8c1c02aba3e92bc942690
child 271918 89e5f92e26d71f5b5c24a2942999eaafaf622019
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus
bugs1154426
milestone40.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 1154426 - Ignore gzip problems if only soft-enforcing. r=mcmanus
netwerk/streamconv/converters/nsHTTPCompressConv.cpp
netwerk/test/unit/test_content_length_underrun.js
--- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
+++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
@@ -35,18 +35,17 @@ nsHTTPCompressConv::nsHTTPCompressConv()
     , mStreamInitialized(false)
     , mLen(0)
     , hMode(0)
     , mSkipCount(0)
     , mFlags(0)
 {
     if (NS_IsMainThread()) {
         mFailUncleanStops =
-            (Preferences::GetBool("network.http.enforce-framing.soft", false) ||
-             Preferences::GetBool("network.http.enforce-framing.http", false));
+            Preferences::GetBool("network.http.enforce-framing.http", false);
     } else {
         mFailUncleanStops = false;
     }
 }
 
 nsHTTPCompressConv::~nsHTTPCompressConv()
 {
     NS_IF_RELEASE(mListener);
--- a/netwerk/test/unit/test_content_length_underrun.js
+++ b/netwerk/test/unit/test_content_length_underrun.js
@@ -213,16 +213,18 @@ function handler4(metadata, response)
   response.write("\r\n");
   response.write(body);
   response.finish();
 }
 
 function completeTest4(request, data, ctx)
 {
   do_check_eq(request.status, Components.results.NS_OK);
+
+  prefs.setBoolPref("network.http.enforce-framing.http1", true);
   run_gzip_test(99);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Test 99: FAIL because a cut off gzip stream CAN be detected
 
 // Note that test 99 here is run completely different than the other tests in
 // this file so if you add more tests here, consider adding them before this.