[Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Feb 2012 09:50:41 +0000 (09:50 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Feb 2012 09:50:41 +0000 (09:50 +0000)
https://bugs.webkit.org/show_bug.cgi?id=78541
<rdar://problem/10036695>

Reviewed by Kent Tamura.

Source/WebKit/mac:

* WebView/WebPreferences.mm: (+[WebPreferences initialize]): Changed default value of the
preference.

Source/WebKit/win:

* WebPreferences.cpp: (WebPreferences::initializeDefaultSettings): Changed default value of
the preference

Source/WebKit2:

* Shared/WebPreferencesStore.h: (WebKit): Changed default value of the preference.

Tools:

* DumpRenderTree/mac/DumpRenderTree.mm: (resetDefaultsToConsistentValues):
* DumpRenderTree/win/DumpRenderTree.cpp: (resetDefaultsToConsistentValues):
After each test, reset to using new protocol.

LayoutTests:

* http/tests/websocket/tests/hixie76/alert-in-event-handler.html:
* http/tests/websocket/tests/hixie76/bad-handshake-crash.html:
* http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars.html:
* http/tests/websocket/tests/hixie76/bad-sub-protocol-empty.html:
* http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii.html:
* http/tests/websocket/tests/hixie76/bufferedAmount-after-close.html:
* http/tests/websocket/tests/hixie76/client-close.html:
* http/tests/websocket/tests/hixie76/close-before-open.html:
* http/tests/websocket/tests/hixie76/close-event.html:
* http/tests/websocket/tests/hixie76/close-on-navigate-new-location.html:
* http/tests/websocket/tests/hixie76/close-on-unload-and-force-gc.html:
* http/tests/websocket/tests/hixie76/close-on-unload-reference-in-parent.html:
* http/tests/websocket/tests/hixie76/close-on-unload.html:
* http/tests/websocket/tests/hixie76/close-unref-websocket.html:
* http/tests/websocket/tests/hixie76/cross-origin.html:
* http/tests/websocket/tests/hixie76/error-detect.html:
* http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer.html:
* http/tests/websocket/tests/hixie76/frame-length-overflow.html:
* http/tests/websocket/tests/hixie76/frame-length-skip.html:
* http/tests/websocket/tests/hixie76/frame-lengths.html:
* http/tests/websocket/tests/hixie76/handshake-challenge-randomness.html:
* http/tests/websocket/tests/hixie76/handshake-error.html:
* http/tests/websocket/tests/hixie76/handshake-fail-by-cross-origin.html:
* http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength.html:
* http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header.html:
* http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr.html:
* http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header.html:
* http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null.html:
* http/tests/websocket/tests/hixie76/handshake-fail-by-sub-protocol-mismatch.html:
* http/tests/websocket/tests/hixie76/long-invalid-header.html:
* http/tests/websocket/tests/hixie76/multiple-connections.html:
* http/tests/websocket/tests/hixie76/null-character.html:
* http/tests/websocket/tests/hixie76/reload-crash.html:
* http/tests/websocket/tests/hixie76/send-after-close-on-unload.html:
* http/tests/websocket/tests/hixie76/send-empty.html:
* http/tests/websocket/tests/hixie76/send-object.html:
* http/tests/websocket/tests/hixie76/send-throw.html:
* http/tests/websocket/tests/hixie76/send.html:
* http/tests/websocket/tests/hixie76/server-close.html:
* http/tests/websocket/tests/hixie76/simple-stress.html:
* http/tests/websocket/tests/hixie76/simple.html:
* http/tests/websocket/tests/hixie76/split-binary-frame-header.html:
* http/tests/websocket/tests/hixie76/sub-protocol-with-space.html:
* http/tests/websocket/tests/hixie76/sub-protocol.html:
* http/tests/websocket/tests/hixie76/undefined-attributes.html:
* http/tests/websocket/tests/hixie76/unicode.html:
* http/tests/websocket/tests/hixie76/url-attribute.html:
* http/tests/websocket/tests/hixie76/url-no-trailing-slash.html:
* http/tests/websocket/tests/hixie76/url-parsing.html:
* http/tests/websocket/tests/hixie76/url-with-credential.html:
* http/tests/websocket/tests/hixie76/url-with-empty-query.html:
* http/tests/websocket/tests/hixie76/url-with-query-for-no-query.html:
* http/tests/websocket/tests/hixie76/url-with-query.html:
* http/tests/websocket/tests/hixie76/websocket-event-target.html:
* http/tests/websocket/tests/hixie76/websocket-pending-activity.html:
* http/tests/websocket/tests/hixie76/websocket-protocol-ignored.html:
* http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash.html:
* http/tests/websocket/tests/hixie76/workers/close-in-shared-worker.html:
* http/tests/websocket/tests/hixie76/workers/close-in-worker.html:
* http/tests/websocket/tests/hixie76/workers/shared-worker-simple.html:
* http/tests/websocket/tests/hixie76/workers/worker-handshake-challenge-randomness.html:
* http/tests/websocket/tests/hixie76/workers/worker-simple.html:
Added overridePreference calls, so that the tests don't depend on platform or DRT default.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@107689 268f45cc-cd09-0410-ab3c-d52691b4dbfc

73 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/websocket/tests/hixie76/alert-in-event-handler.html
LayoutTests/http/tests/websocket/tests/hixie76/bad-handshake-crash.html
LayoutTests/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars.html
LayoutTests/http/tests/websocket/tests/hixie76/bad-sub-protocol-empty.html
LayoutTests/http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii.html
LayoutTests/http/tests/websocket/tests/hixie76/bufferedAmount-after-close.html
LayoutTests/http/tests/websocket/tests/hixie76/client-close.html
LayoutTests/http/tests/websocket/tests/hixie76/close-before-open.html
LayoutTests/http/tests/websocket/tests/hixie76/close-event.html
LayoutTests/http/tests/websocket/tests/hixie76/close-on-navigate-new-location.html
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload-and-force-gc.html
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload-reference-in-parent.html
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload.html
LayoutTests/http/tests/websocket/tests/hixie76/close-unref-websocket.html
LayoutTests/http/tests/websocket/tests/hixie76/cross-origin.html
LayoutTests/http/tests/websocket/tests/hixie76/error-detect.html
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer.html
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-overflow.html
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-skip.html
LayoutTests/http/tests/websocket/tests/hixie76/frame-lengths.html
LayoutTests/http/tests/websocket/tests/hixie76/handshake-challenge-randomness.html
LayoutTests/http/tests/websocket/tests/hixie76/handshake-error.html
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-cross-origin.html
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength.html
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header.html
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr.html
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header.html
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null.html
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-sub-protocol-mismatch.html
LayoutTests/http/tests/websocket/tests/hixie76/long-invalid-header.html
LayoutTests/http/tests/websocket/tests/hixie76/multiple-connections.html
LayoutTests/http/tests/websocket/tests/hixie76/null-character.html
LayoutTests/http/tests/websocket/tests/hixie76/reload-crash.html
LayoutTests/http/tests/websocket/tests/hixie76/send-after-close-on-unload.html
LayoutTests/http/tests/websocket/tests/hixie76/send-empty.html
LayoutTests/http/tests/websocket/tests/hixie76/send-object.html
LayoutTests/http/tests/websocket/tests/hixie76/send-throw.html
LayoutTests/http/tests/websocket/tests/hixie76/send.html
LayoutTests/http/tests/websocket/tests/hixie76/server-close.html
LayoutTests/http/tests/websocket/tests/hixie76/simple-stress.html
LayoutTests/http/tests/websocket/tests/hixie76/simple.html
LayoutTests/http/tests/websocket/tests/hixie76/split-binary-frame-header.html
LayoutTests/http/tests/websocket/tests/hixie76/sub-protocol-with-space.html
LayoutTests/http/tests/websocket/tests/hixie76/sub-protocol.html
LayoutTests/http/tests/websocket/tests/hixie76/undefined-attributes.html
LayoutTests/http/tests/websocket/tests/hixie76/unicode.html
LayoutTests/http/tests/websocket/tests/hixie76/url-attribute.html
LayoutTests/http/tests/websocket/tests/hixie76/url-no-trailing-slash.html
LayoutTests/http/tests/websocket/tests/hixie76/url-parsing.html
LayoutTests/http/tests/websocket/tests/hixie76/url-with-credential.html
LayoutTests/http/tests/websocket/tests/hixie76/url-with-empty-query.html
LayoutTests/http/tests/websocket/tests/hixie76/url-with-query-for-no-query.html
LayoutTests/http/tests/websocket/tests/hixie76/url-with-query.html
LayoutTests/http/tests/websocket/tests/hixie76/websocket-event-target.html
LayoutTests/http/tests/websocket/tests/hixie76/websocket-pending-activity.html
LayoutTests/http/tests/websocket/tests/hixie76/websocket-protocol-ignored.html
LayoutTests/http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash.html
LayoutTests/http/tests/websocket/tests/hixie76/workers/close-in-shared-worker.html
LayoutTests/http/tests/websocket/tests/hixie76/workers/close-in-worker.html
LayoutTests/http/tests/websocket/tests/hixie76/workers/shared-worker-simple.html
LayoutTests/http/tests/websocket/tests/hixie76/workers/worker-handshake-challenge-randomness.html
LayoutTests/http/tests/websocket/tests/hixie76/workers/worker-simple.html
LayoutTests/platform/wk2/Skipped
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebPreferences.mm
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebPreferences.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebPreferencesStore.h
Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/DumpRenderTree/win/DumpRenderTree.cpp

index 25475e3..a432446 100644 (file)
@@ -1,3 +1,75 @@
+2012-02-14  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets
+        https://bugs.webkit.org/show_bug.cgi?id=78541
+        <rdar://problem/10036695>
+
+        Reviewed by Kent Tamura.
+
+        * http/tests/websocket/tests/hixie76/alert-in-event-handler.html:
+        * http/tests/websocket/tests/hixie76/bad-handshake-crash.html:
+        * http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars.html:
+        * http/tests/websocket/tests/hixie76/bad-sub-protocol-empty.html:
+        * http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii.html:
+        * http/tests/websocket/tests/hixie76/bufferedAmount-after-close.html:
+        * http/tests/websocket/tests/hixie76/client-close.html:
+        * http/tests/websocket/tests/hixie76/close-before-open.html:
+        * http/tests/websocket/tests/hixie76/close-event.html:
+        * http/tests/websocket/tests/hixie76/close-on-navigate-new-location.html:
+        * http/tests/websocket/tests/hixie76/close-on-unload-and-force-gc.html:
+        * http/tests/websocket/tests/hixie76/close-on-unload-reference-in-parent.html:
+        * http/tests/websocket/tests/hixie76/close-on-unload.html:
+        * http/tests/websocket/tests/hixie76/close-unref-websocket.html:
+        * http/tests/websocket/tests/hixie76/cross-origin.html:
+        * http/tests/websocket/tests/hixie76/error-detect.html:
+        * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer.html:
+        * http/tests/websocket/tests/hixie76/frame-length-overflow.html:
+        * http/tests/websocket/tests/hixie76/frame-length-skip.html:
+        * http/tests/websocket/tests/hixie76/frame-lengths.html:
+        * http/tests/websocket/tests/hixie76/handshake-challenge-randomness.html:
+        * http/tests/websocket/tests/hixie76/handshake-error.html:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-cross-origin.html:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength.html:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header.html:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr.html:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header.html:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null.html:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-sub-protocol-mismatch.html:
+        * http/tests/websocket/tests/hixie76/long-invalid-header.html:
+        * http/tests/websocket/tests/hixie76/multiple-connections.html:
+        * http/tests/websocket/tests/hixie76/null-character.html:
+        * http/tests/websocket/tests/hixie76/reload-crash.html:
+        * http/tests/websocket/tests/hixie76/send-after-close-on-unload.html:
+        * http/tests/websocket/tests/hixie76/send-empty.html:
+        * http/tests/websocket/tests/hixie76/send-object.html:
+        * http/tests/websocket/tests/hixie76/send-throw.html:
+        * http/tests/websocket/tests/hixie76/send.html:
+        * http/tests/websocket/tests/hixie76/server-close.html:
+        * http/tests/websocket/tests/hixie76/simple-stress.html:
+        * http/tests/websocket/tests/hixie76/simple.html:
+        * http/tests/websocket/tests/hixie76/split-binary-frame-header.html:
+        * http/tests/websocket/tests/hixie76/sub-protocol-with-space.html:
+        * http/tests/websocket/tests/hixie76/sub-protocol.html:
+        * http/tests/websocket/tests/hixie76/undefined-attributes.html:
+        * http/tests/websocket/tests/hixie76/unicode.html:
+        * http/tests/websocket/tests/hixie76/url-attribute.html:
+        * http/tests/websocket/tests/hixie76/url-no-trailing-slash.html:
+        * http/tests/websocket/tests/hixie76/url-parsing.html:
+        * http/tests/websocket/tests/hixie76/url-with-credential.html:
+        * http/tests/websocket/tests/hixie76/url-with-empty-query.html:
+        * http/tests/websocket/tests/hixie76/url-with-query-for-no-query.html:
+        * http/tests/websocket/tests/hixie76/url-with-query.html:
+        * http/tests/websocket/tests/hixie76/websocket-event-target.html:
+        * http/tests/websocket/tests/hixie76/websocket-pending-activity.html:
+        * http/tests/websocket/tests/hixie76/websocket-protocol-ignored.html:
+        * http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash.html:
+        * http/tests/websocket/tests/hixie76/workers/close-in-shared-worker.html:
+        * http/tests/websocket/tests/hixie76/workers/close-in-worker.html:
+        * http/tests/websocket/tests/hixie76/workers/shared-worker-simple.html:
+        * http/tests/websocket/tests/hixie76/workers/worker-handshake-challenge-randomness.html:
+        * http/tests/websocket/tests/hixie76/workers/worker-simple.html:
+        Added overridePreference calls, so that the tests don't depend on platform or DRT default.
+
 2012-02-14  Mike Lawther  <mikelawther@chromium.org>
 
         CSS3 calc: embed calc expressions in CSSPrimitiveValue
index eca0cd2..fc3409c 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure event handler called serially.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/send2");
 
index 75f13e2..1c25bbb 100644 (file)
@@ -11,6 +11,9 @@ description("Make sure WebSocket doesn't crash with bad handshake message.");
 
 window.jsTestIsAsync = true;
 
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
+
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/bad-handshake-crash");
 ws.onopen = function () {
     debug("WebSocket is open");
index 4e518b4..f50b6ba 100644 (file)
@@ -9,6 +9,9 @@
 <script type="text/javascript">
 description("Test WebSocket bad sub-protocol names by control characters.");
 
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
+
 // Fails if protocol contains an character less than U+0020.
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0000")');
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0009")');
index 346d443..a2ca2b3 100644 (file)
@@ -9,6 +9,9 @@
 <script type="text/javascript">
 description("Test WebSocket bad sub-protocol names (empty).");
 
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
+
 // Fails if protocol is an empty string.
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "")');
 
index 88c0b8f..ff227a2 100644 (file)
@@ -9,6 +9,9 @@
 <script type="text/javascript">
 description("Test WebSocket bad sub-protocol names by non-ASCII chars.");
 
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
+
 // Fails if protocol contains an character greater than U+007E.
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u007F")');
 shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u0080")');
index 83407c1..5fbb61f 100644 (file)
@@ -10,6 +10,8 @@
 description("Web Socket bufferedAmount after closed");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://localhost:8880/websocket/tests/hixie76/simple");
 
index bbb51a3..0f13b83 100644 (file)
@@ -10,6 +10,8 @@
 description("WebSocket: Test client-initiated close.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/client-close");
 var closeEvent;
index 2646bf2..3111d09 100644 (file)
@@ -10,6 +10,8 @@
 description("Test if Web Socket fires close event when WebSocket is opened and closed fore open event is received.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo");
 ws.onclose = function() {
index c45b943..fc08e38 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure WebSocket fires CloseEvent when closed.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple");
 
index 6e4cc2f..7d4c303 100644 (file)
@@ -10,6 +10,8 @@
 description("Test if Web Socket is closed when navigating to new location.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var frameDiv;
 var closedSocket;
index 2b6a886..be6d672 100644 (file)
@@ -10,6 +10,8 @@
 description("Test if Web Socket is closed on unload and not crashed if garbage collected");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function gc()
 {
index 3f38599..7fe5089 100644 (file)
@@ -10,6 +10,8 @@
 description("Test if Web Socket opened in iframe but referred in parent document is closed on unloading the frame.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var frameDiv;
 var closedSocket;
index fb38e22..7b03469 100644 (file)
@@ -10,6 +10,8 @@
 description("Test if Web Socket is closed on unload");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var frameDiv;
 var closedSocket;
index 4d70022..0ccf770 100644 (file)
@@ -10,6 +10,8 @@
 description("Test if Web Socket is closed while handshaking and unreferenced, it should fire close event at most once.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var countCloseEvent = 0;
 
index 55d3150..3bec6ce 100644 (file)
@@ -10,6 +10,8 @@
 description("Web Socket Cross Origin test");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var origin;
 
index 6926f2c..4aa12c7 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure WebSocket correctly fire error event for unknown frame type.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var errorCount = 0;
 
index 7b86900..854aa4b 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure WebSocket correctly skip lengthed frame even if received data has incomplete frame.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var received_messages = [];
 var expected_messages = ["hello"];
index 3a1ba66..9532b83 100644 (file)
@@ -9,6 +9,8 @@
 description("Make sure WebSocket does not crash and report error when it sees length overflow");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/frame-length-overflow");
 ws.onopen = function () {
index 27b9c26..90f1f90 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure WebSocket correctly skip lengthed frame.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var received_messages = [];
 var expected_messages = ["hello", "world"];
index d4aca7b..7c77861 100644 (file)
@@ -8,6 +8,7 @@ var maxLength = 1025;
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 }
 
 function log(message)
index 33777f7..c3ce889 100644 (file)
@@ -10,6 +10,8 @@
 description('Handshake request should contain random challenge values.');
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var challenge1;
 var challenge2;
index 704d5a9..2b34f10 100644 (file)
@@ -10,6 +10,8 @@
 description("Handshake error test");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function endTest()
 {
index a966d59..4d772f7 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure Web Socket connection failed if origin mismatches.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var connected = false;
 var origin;
index 2f02f25..9266b24 100644 (file)
@@ -10,6 +10,8 @@
 description('Connection should fail immediately, rather than succeeding or staying in limbo until timeout, if handshake is longer than 1024 bytes.');
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var timedOut = false;
 var connected = false;
index 2f4f31a..4c06d7c 100644 (file)
@@ -10,6 +10,8 @@
 description("Test that WebSocket handshake fails if Connection header field isn't reflected by the server.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function endTest()
 {
index 0cc902c..7cc7be8 100644 (file)
@@ -10,6 +10,8 @@
 description('Handshake should fail when the first line does not end with CRLF.');
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var connected = false;
 var origin;
index 3edf136..bdb5ea1 100644 (file)
@@ -10,6 +10,8 @@
 description("Test that WebSocket handshake fails if Upgrade header field isn't reflected by the server.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function endTest()
 {
index be86724..b1812bd 100644 (file)
@@ -10,6 +10,8 @@
 description('Connection should fail immediately, rather than succeeding or staying in limbo until timeout, if a null byte is received before the handshake.');
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var timedOut = false;
 var connected = false;
index 6a95bf5..d0397f7 100644 (file)
@@ -10,6 +10,8 @@
 description("Test WebSocket handshake fail if sub protocol name mismatches.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var protocol;
 
index acd7378..715b2a6 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure WebSocket gives errors on long invalid upgrade header.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function finish() {
     clearTimeout(timeoutID);
index 9104621..567427c 100644 (file)
@@ -4,6 +4,7 @@
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 }
 
 var socketCount = 50;
index 0027a16..2e08a98 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure WebSocket transfer null character");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo");
 // \xff in string would be \xc3\xbf on websocket connection (UTF-8)
index 68ae361..03cbc7d 100644 (file)
@@ -10,6 +10,8 @@
 description("Test if it doesn't crash when reloading while Web Socket is busy");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var frameDiv;
 var reloadCount = 0;
index 32c1d97..82e3bdb 100644 (file)
@@ -10,6 +10,8 @@
 description("Test if Web Socket opened in iframe, referred in parent document is, and try to send() returns false.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var frameDiv;
 var closedSocket;
index 234db69..a091ea5 100644 (file)
@@ -10,6 +10,8 @@
 description("WebSocket: Calling send() without arguments should raise SyntaxError.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo");
 
index 9c3e9b0..6654625 100644 (file)
@@ -10,6 +10,8 @@
 description("WebSocket: send(object) should be interpreted as send(object.toString()).");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function createEmptyBlob()
 {
index 89a4290..8d02e9f 100644 (file)
@@ -10,6 +10,8 @@
 description("Web Socket send test");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function endTest()
 {
index 60c0793..7116987 100644 (file)
@@ -10,6 +10,8 @@
 description("Web Socket send test");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function endTest()
 {
index 3867827..3686113 100644 (file)
@@ -10,6 +10,8 @@
 description("WebSocket: Test server-initiated close.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/server-close");
 var closeEvent;
index b2144a0..8d917d4 100644 (file)
@@ -8,6 +8,7 @@ var numSmallMessages = 1000;
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 }
 
 function log(message)
index 9c60dca..1647b74 100644 (file)
@@ -10,6 +10,8 @@
 description("Simple Web Socket test");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function endTest()
 {
index 8b47839..69e791f 100644 (file)
@@ -10,6 +10,8 @@
 description("WebSocket: Hixie76 binary frames should be handled correctly even if frame header is split into multiple TCP packets.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var ws = new WebSocket("ws://localhost:8880/websocket/tests/hixie76/split-binary-frame-header");
 var errorCount = 0;
index 64f7ab3..9a901b9 100644 (file)
@@ -10,6 +10,8 @@
 description("Test WebSocket handshake success with sub protocol contains space.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var protocol;
 
index bc83f32..3c52736 100644 (file)
@@ -10,6 +10,8 @@
 description("Test WebSocket handshake success with sub protocol.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var protocol;
 
index 0d7b411..3f953e9 100644 (file)
@@ -9,6 +9,9 @@
 <script type="text/javascript">
 description("Test WebSocket attributes which should not be defined when hixie-76 protocol is used.");
 
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
+
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple");
 
 shouldBeUndefined("ws.binaryType");
index 86ceed0..0585cd1 100644 (file)
@@ -10,6 +10,8 @@
 description("Web Socket unicode message test");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 function endTest()
 {
index b5315fa..4853d10 100644 (file)
@@ -10,6 +10,9 @@
 
 description("Both .URL and .url attributes should work (for compatibility reasons).");
 
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
+
 var url = "ws://127.0.0.1:8880/";
 var ws = new WebSocket(url);
 
index bca6c27..628eee8 100644 (file)
@@ -10,6 +10,8 @@
 description("URL that doesn't have trailing slash should not emit empty Request-URI.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var url = "ws://127.0.0.1:8880";
 var handshake_success = false;
index ff15561..c2c1af8 100644 (file)
@@ -9,6 +9,9 @@
 <script type="text/javascript">
 description("Test WebSocket URL parsing.");
 
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
+
 // Invalid url will fail to be parsed.
 shouldThrow('new WebSocket("ws://javascript:a")');
 
index 9de4f20..cd3a944 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure handshake with URL with credentail info success.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var url = "ws://user:pass@127.0.0.1:8880/websocket/tests/hixie76/echo-location";
 var handshake_success = false;
index 7470c04..3db7825 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure handshake with URL with empty query components success.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var url = "ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location?";
 var handshake_success = false;
index cf3ce56..fb39d53 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure handshake with URL with query components fails against server that doesn't support query component.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var url = "ws://127.0.0.1:8880/websocket/tests/hixie76/no-query?";
 var handshake_success = false;
index 84efbc2..4d3d5ac 100644 (file)
@@ -10,6 +10,8 @@
 description("Make sure handshake with URL with query components success.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var url = "ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location?q=v";
 var handshake_success = false;
index 9d1d058..ff850f3 100644 (file)
@@ -9,6 +9,9 @@
 <script type="text/javascript">
 description("Make sure WebSocket object acts as EventTarget.");
 
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
+
 var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple");
 ws.close(); // That is not a test with a WebSocket server, prevent logging an error to console.
 var open_event_handled = false;
index 6b41545..f03e798 100644 (file)
@@ -4,6 +4,7 @@
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 0);
 }
 
 function gc()
index c04c9c3..8870eb9 100644 (file)
@@ -10,6 +10,8 @@
 description("Test WebSocket handshake success without protocol and ignore WebSocket-Protocol from server.");
 
 window.jsTestIsAsync = true;
+if (window.layoutTestController)
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 
 var protocol;
 
index d95a17c..2fd59c4 100644 (file)
@@ -11,6 +11,7 @@
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 }
 
 function log(message)
index 91b77d4..72aea31 100644 (file)
@@ -11,6 +11,7 @@
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 }
 
 function log(message)
index 7c631d2..0b72dc3 100644 (file)
@@ -11,6 +11,7 @@
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 }
 
 function log(message)
index d279606..076f378 100644 (file)
@@ -11,6 +11,7 @@
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 }
 
 function log(message)
index b846daa..526d6f6 100644 (file)
@@ -11,6 +11,7 @@
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 }
 
 function log(message)
index bc24e72..4317f12 100644 (file)
@@ -11,6 +11,7 @@
 if (window.layoutTestController) {
     layoutTestController.dumpAsText();
     layoutTestController.waitUntilDone();
+    layoutTestController.overridePreference("WebKitHixie76WebSocketProtocolEnabled", 1);
 }
 
 function log(message)
index 13af518..6e97c92 100644 (file)
@@ -821,9 +821,6 @@ platform/mac/fast/text/rounding-hacks-expansion.html
 # http://webkit.org/b/58990
 editing/undo/undo-iframe-location-change.html
 
-# Skipped until new WebSocket protocol is implemented. http://webkit.org/b/50099
-http/tests/websocket/tests/hybi/
-
 # Times out
 # https://bugs.webkit.org/show_bug.cgi?id=63806
 http/tests/cache/history-only-cached-subresource-loads-max-age-https.html
index 713e044..3166523 100644 (file)
@@ -1,3 +1,14 @@
+2012-02-14  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets
+        https://bugs.webkit.org/show_bug.cgi?id=78541
+        <rdar://problem/10036695>
+
+        Reviewed by Kent Tamura.
+
+        * WebView/WebPreferences.mm: (+[WebPreferences initialize]): Changed default value of the
+        preference.
+
 2012-02-11  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         Convert svg/animations to use SMIL methods for driving the timeline
index f49df54..1532039 100644 (file)
@@ -384,7 +384,7 @@ static WebCacheModel cacheModelForMainBundle(void)
         [NSNumber numberWithBool:YES],  WebKitHyperlinkAuditingEnabledPreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitUsePreHTML5ParserQuirksKey,
         [NSNumber numberWithBool:YES],  WebKitAVFoundationEnabledKey,
-        [NSNumber numberWithBool:YES],  WebKitHixie76WebSocketProtocolEnabledKey,
+        [NSNumber numberWithBool:NO],  WebKitHixie76WebSocketProtocolEnabledKey,
         [NSNumber numberWithBool:NO],   WebKitMediaPlaybackRequiresUserGesturePreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitMediaPlaybackAllowsInlinePreferenceKey,
         [NSNumber numberWithBool:NO],   WebKitWebAudioEnabledPreferenceKey,
index ca6be20..119da17 100644 (file)
@@ -1,3 +1,14 @@
+2012-02-14  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets
+        https://bugs.webkit.org/show_bug.cgi?id=78541
+        <rdar://problem/10036695>
+
+        Reviewed by Kent Tamura.
+
+        * WebPreferences.cpp: (WebPreferences::initializeDefaultSettings): Changed default value of
+        the preference
+
 2012-02-11  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         Convert svg/animations to use SMIL methods for driving the timeline
index 66175e0..6f5ed8e 100644 (file)
@@ -268,7 +268,7 @@ void WebPreferences::initializeDefaultSettings()
 
     CFDictionaryAddValue(defaults, CFSTR(WebKitMemoryInfoEnabledPreferenceKey), kCFBooleanFalse);
     CFDictionaryAddValue(defaults, CFSTR(WebKitHyperlinkAuditingEnabledPreferenceKey), kCFBooleanTrue);
-    CFDictionaryAddValue(defaults, CFSTR(WebKitHixie76WebSocketProtocolEnabledPreferenceKey), kCFBooleanTrue);
+    CFDictionaryAddValue(defaults, CFSTR(WebKitHixie76WebSocketProtocolEnabledPreferenceKey), kCFBooleanFalse);
 
     CFDictionaryAddValue(defaults, CFSTR(WebKitMediaPlaybackRequiresUserGesturePreferenceKey), kCFBooleanFalse);
     CFDictionaryAddValue(defaults, CFSTR(WebKitMediaPlaybackAllowsInlinePreferenceKey), kCFBooleanTrue);
index 58f286e..ddd0f83 100644 (file)
@@ -1,3 +1,13 @@
+2012-02-14  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets
+        https://bugs.webkit.org/show_bug.cgi?id=78541
+        <rdar://problem/10036695>
+
+        Reviewed by Kent Tamura.
+
+        * Shared/WebPreferencesStore.h: (WebKit): Changed default value of the preference.
+
 2012-02-13  W. James MacLean  <wjmaclean@chromium.org>
 
         [chromium] Remove obsolete zoom animation pathway.
index 0cdc975..eba447f 100644 (file)
@@ -90,7 +90,7 @@ namespace WebKit {
     macro(AllowUniversalAccessFromFileURLs, allowUniversalAccessFromFileURLs, Bool, bool, false) \
     macro(AllowFileAccessFromFileURLs, allowFileAccessFromFileURLs, Bool, bool, false) \
     macro(AVFoundationEnabled, isAVFoundationEnabled, Bool, bool, DEFAULT_WEBKIT_AVFOUNDATION_ENABLED) \
-    macro(Hixie76WebSocketProtocolEnabled, hixie76WebSocketProtocolEnabled, Bool, bool, true) \
+    macro(Hixie76WebSocketProtocolEnabled, hixie76WebSocketProtocolEnabled, Bool, bool, false) \
     macro(MediaPlaybackRequiresUserGesture, mediaPlaybackRequiresUserGesture, Bool, bool, false) \
     macro(MediaPlaybackAllowsInline, mediaPlaybackAllowsInline, Bool, bool, true) \
     macro(InspectorStartsAttached, inspectorStartsAttached, Bool, bool, true) \
index d46b5c1..d58bd60 100644 (file)
@@ -1,3 +1,15 @@
+2012-02-14  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac][Win][WK2] Switch to RFC 6455 protocol for WebSockets
+        https://bugs.webkit.org/show_bug.cgi?id=78541
+        <rdar://problem/10036695>
+
+        Reviewed by Kent Tamura.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm: (resetDefaultsToConsistentValues):
+        * DumpRenderTree/win/DumpRenderTree.cpp: (resetDefaultsToConsistentValues):
+        After each test, reset to using new protocol.
+
 2012-02-11  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         Convert svg/animations to use SMIL methods for driving the timeline
index 3012a70..4787aa5 100644 (file)
@@ -650,7 +650,7 @@ static void resetDefaultsToConsistentValues()
     [preferences setWebGLEnabled:NO];
     [preferences setUsePreHTML5ParserQuirks:NO];
     [preferences setAsynchronousSpellCheckingEnabled:NO];
-    [preferences setHixie76WebSocketProtocolEnabled:YES];
+    [preferences setHixie76WebSocketProtocolEnabled:NO];
     [preferences setMockScrollbarsEnabled:YES];
 
 #if ENABLE(WEB_AUDIO)
index 1ec5c5e..2b56895 100644 (file)
@@ -880,7 +880,7 @@ static void resetDefaultsToConsistentValues(IWebPreferences* preferences)
         prefsPrivate->setFrameFlatteningEnabled(FALSE);
         prefsPrivate->setOfflineWebApplicationCacheEnabled(TRUE);
         prefsPrivate->setLoadsSiteIconsIgnoringImageLoadingPreference(FALSE);
-        prefsPrivate->setHixie76WebSocketProtocolEnabled(TRUE);
+        prefsPrivate->setHixie76WebSocketProtocolEnabled(FALSE);
     }
     setAlwaysAcceptCookies(false);