Bug 1097320 - Enable advertising h2. r=mcmanus
authorNicholas Hurley <hurley@todesschaf.org>
Tue, 25 Nov 2014 14:43:27 -0800
changeset 241837 7b6fe53f601f7c1e66aa4cf339954ad4c365649f
parent 241836 1fc1a58e91520646a15ebbf2724e1de0fe506924
child 241838 ef4e7eebec3b48c3cab13c988fb8cb1fa5d60944
push id4311
push userraliiev@mozilla.com
push dateMon, 12 Jan 2015 19:37:41 +0000
treeherdermozilla-beta@150c9fed433b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus
bugs1097320
milestone36.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 1097320 - Enable advertising h2. r=mcmanus
modules/libpref/init/all.js
netwerk/test/unit/test_http2.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1271,17 +1271,17 @@ pref("network.http.bypass-cachelock-thre
 #else
 pref("network.http.bypass-cachelock-threshold", 250);
 #endif
 
 // Try and use SPDY when using SSL
 pref("network.http.spdy.enabled", true);
 pref("network.http.spdy.enabled.v3-1", true);
 pref("network.http.spdy.enabled.http2draft", true);
-pref("network.http.spdy.enabled.http2", false);
+pref("network.http.spdy.enabled.http2", true);
 pref("network.http.spdy.enforce-tls-profile", true);
 pref("network.http.spdy.chunk-size", 16000);
 pref("network.http.spdy.timeout", 180);
 pref("network.http.spdy.coalesce-hostnames", true);
 pref("network.http.spdy.persistent-settings", false);
 pref("network.http.spdy.ping-threshold", 58);
 pref("network.http.spdy.ping-timeout", 8);
 pref("network.http.spdy.send-buffer-size", 131072);
--- a/netwerk/test/unit/test_http2.js
+++ b/netwerk/test/unit/test_http2.js
@@ -373,17 +373,17 @@ var altsvcClientListener = {
 	run_next_test();
     }
   }
 };
 
 function altsvcHttp1Server(metadata, response) {
   response.setStatusLine(metadata.httpVersion, 200, "OK");
   response.setHeader("Content-Type", "text/plain", false);
-  response.setHeader("Alt-Svc", 'h2=":6944"; ma=3200, h2-15=":6944"', false);
+  response.setHeader("Alt-Svc", 'h2-15=":6944"', false);
   var body = "this is where a cool kid would write something neat.\n";
   response.bodyOutputStream.write(body, body.length);
 }
 
 function test_http2_altsvc() {
   httpserv = new HttpServer();
   httpserv.registerPathHandler("/altsvc1", altsvcHttp1Server);
   httpserv.start(-1);