687295 - disable websockets deprecated deflate-stream extension due to thin vnc interop problem r=bz
authorPatrick McManus <mcmanus@ducksong.com>
Tue, 20 Sep 2011 17:04:57 -0400
changeset 78534 6bcc3a001bb348195f32e3402f185ee6fe6b2175
parent 78533 68928bdabfd745229946af70e896ac48112af3c0
child 78535 057c3fccb95608f494999d2e08b1572aa386f410
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs687295
milestone9.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
687295 - disable websockets deprecated deflate-stream extension due to thin vnc interop problem r=bz
content/base/test/test_websocket.html
modules/libpref/src/init/all.js
--- a/content/base/test/test_websocket.html
+++ b/content/base/test/test_websocket.html
@@ -1062,17 +1062,17 @@ function test38()
 {
   var prots=["test-38"];
 
   var ws = CreateTestWS("ws://mochi.test:8888/tests/content/base/test/file_websocket", prots);
   ws.onopen = function(e)
   {
     ok(true, "test 38 open");
     ok(ws.extensions != undefined, "extensions attribute defined");
-    ok(ws.extensions == "deflate-stream", "extensions attribute deflate-stream");
+//    ok(ws.extensions == "deflate-stream", "extensions attribute deflate-stream");
     ws.close();
   };
 
   ws.onclose = function(e)
   {
     ok(true, "test 38 close");
     doTest(39);
   };
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -815,18 +815,20 @@ pref("network.websocket.timeout.close", 
 pref("network.websocket.timeout.ping.request", 0);
 
 // the deadline, expressed in seconds, for some read activity to occur after
 // generating a ping. If no activity happens then an error and unclean close
 // event is sent to the javascript websockets application
 pref("network.websocket.timeout.ping.response", 10);
 
 // Defines whether or not to try and negotiate the stream-deflate compression
-// extension with the websocket server
-pref("network.websocket.extensions.stream-deflate", true);
+// extension with the websocket server. Stream-Deflate has been removed from
+// the standards track document, but can still be used by servers who opt
+// into it.
+pref("network.websocket.extensions.stream-deflate", false);
 
 // the maximum number of concurrent websocket sessions. By specification there
 // is never more than one handshake oustanding to an individual host at
 // one time.
 pref("network.websocket.max-connections", 200);
 
 // by default scripts loaded from a https:// origin can only open secure
 // (i.e. wss://) websockets.