☠☠ backed out by 51d8f7a15a37 ☠ ☠ | |
author | Daniel Stenberg <daniel@haxx.se> |
Mon, 20 Apr 2015 07:27:00 -0400 | |
changeset 240519 | 78aab1149276bd155c64e4216bd12d561abe3372 |
parent 240518 | c214d74afc787e5557d8c1c02aba3e92bc942690 |
child 240520 | 89e5f92e26d71f5b5c24a2942999eaafaf622019 |
push id | 58847 |
push user | ryanvm@gmail.com |
push date | Wed, 22 Apr 2015 15:53:40 +0000 |
treeherder | mozilla-inbound@b9a594d013bd [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mcmanus |
bugs | 1154426 |
milestone | 40.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
|
netwerk/streamconv/converters/nsHTTPCompressConv.cpp | file | annotate | diff | comparison | revisions | |
netwerk/test/unit/test_content_length_underrun.js | file | annotate | diff | comparison | revisions |
--- 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.