WebSocket: Introduce pywebsocket-0.6b2
authoryutak@chromium.org <yutak@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Jul 2011 06:26:26 +0000 (06:26 +0000)
committeryutak@chromium.org <yutak@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Jul 2011 06:26:26 +0000 (06:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=64534

Reviewed by Kent Tamura.

Source/WebCore:

pywebsocket now accepts "Sec-WebSocket-Version: 8" as required in hybi-10 specification.

No new functionality is added, thus no new tests. Existing WebSocket tests should keep passing.

* websockets/WebSocketHandshake.cpp:
(WebCore::WebSocketHandshake::clientHandshakeMessage):
(WebCore::WebSocketHandshake::clientHandshakeRequest):

Tools:

* Scripts/webkitpy/thirdparty/__init__.py:

LayoutTests:

Module "mod_pywebsocket.handshake.hybi06" has been renamed to "mod_pywebsocket.handshake.hybi".

* http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py:
* http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py:
* http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py:
* http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py:
* http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py:
* http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py:
* http/tests/websocket/tests/hybi/handshake-fail-by-prepended-null_wsh.py:

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

12 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py
LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-prepended-null_wsh.py
Source/WebCore/ChangeLog
Source/WebCore/websockets/WebSocketHandshake.cpp
Tools/ChangeLog
Tools/Scripts/webkitpy/thirdparty/__init__.py

index 20721dcbd1ba7e6c6926f24cfa57eade48009e2c..16bf98fe93ad65c84f5e9558bbedc756b088ac06 100644 (file)
@@ -1,3 +1,20 @@
+2011-07-14  Yuta Kitamura  <yutak@chromium.org>
+
+        WebSocket: Introduce pywebsocket-0.6b2
+        https://bugs.webkit.org/show_bug.cgi?id=64534
+
+        Reviewed by Kent Tamura.
+
+        Module "mod_pywebsocket.handshake.hybi06" has been renamed to "mod_pywebsocket.handshake.hybi".
+
+        * http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py:
+        * http/tests/websocket/tests/hybi/handshake-fail-by-prepended-null_wsh.py:
+
 2011-07-14  Kenichi Ishibashi  <bashi@chromium.org>
 
         <input form="x"> should not associate the input with any forms when there is no  form with id="x"
index a4d48822ba041f5953cd2d66e8164a95ca459f90..fe5777962e6282ea9c6471696e2179344ecb2dbd 100644 (file)
@@ -1,4 +1,4 @@
-from mod_pywebsocket.handshake.hybi06 import compute_accept
+from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
index c0a3d77158a1a1d270e4ae24676e3d57b54a09ee..da1f9df9feb7b0843d60147711cc5da28eb59091 100644 (file)
@@ -1,4 +1,4 @@
-from mod_pywebsocket.handshake.hybi06 import compute_accept
+from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
index 6768799d85624d2ad717742dba4a77873cbc9b4f..b27793988a9eedacc50d9c6eed0b30f0d4b3a138 100644 (file)
@@ -20,7 +20,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-from mod_pywebsocket.handshake.hybi06 import compute_accept
+from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
index f9965183e500746911bb3be8f615712fd8c8805d..8e4225dad08f9a1646bee9e6ddffc6ff9f020edf 100644 (file)
@@ -1,4 +1,4 @@
-from mod_pywebsocket.handshake.hybi06 import compute_accept
+from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
index 5c4b9e394268042f102df17b10a0bd387fd2108d..cf9a97eb47765bb15aa54e75889376318a64aa99 100644 (file)
@@ -1,4 +1,4 @@
-from mod_pywebsocket.handshake.hybi06 import compute_accept
+from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
index f88d50010886e2051a09404707558d99b2e017c3..d77e0893cb5ec778285afd2766f2b6120b688f1f 100644 (file)
@@ -1,4 +1,4 @@
-from mod_pywebsocket.handshake.hybi06 import compute_accept
+from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
index 28adab4b0be7cf0779633c1567b2d7fe6e933c09..b3eb961e80ebcedccf1b3b9c5c7a69c109e50dad 100644 (file)
@@ -22,7 +22,7 @@
 
 import time
 from mod_pywebsocket import stream
-from mod_pywebsocket.handshake.hybi06 import compute_accept
+from mod_pywebsocket.handshake.hybi import compute_accept
 
 
 def web_socket_do_extra_handshake(request):
index 64d87efb3325eaa9678631969d0f84bf10a9b35b..3a69c3f8c80e750f10bae190eb05b5c07e120d8d 100644 (file)
@@ -1,3 +1,18 @@
+2011-07-14  Yuta Kitamura  <yutak@chromium.org>
+
+        WebSocket: Introduce pywebsocket-0.6b2
+        https://bugs.webkit.org/show_bug.cgi?id=64534
+
+        Reviewed by Kent Tamura.
+
+        pywebsocket now accepts "Sec-WebSocket-Version: 8" as required in hybi-10 specification.
+
+        No new functionality is added, thus no new tests. Existing WebSocket tests should keep passing.
+
+        * websockets/WebSocketHandshake.cpp:
+        (WebCore::WebSocketHandshake::clientHandshakeMessage):
+        (WebCore::WebSocketHandshake::clientHandshakeRequest):
+
 2011-07-14  SravanKumar S  <sravan.ken@gmail.com>
 
         Replaced isChecked() with shouldAppearChecked() in HTMLInputElement.cpp along with all the corresponding function calls.
index 6a0649f83d12825b6a01155153cf629f34db41bb..b3311b0446a69b819714a3d5b8cd72f29e19958c 100644 (file)
@@ -289,10 +289,7 @@ CString WebSocketHandshake::clientHandshakeMessage() const
         fields.append("Sec-WebSocket-Key2: " + m_hixie76SecWebSocketKey2);
     } else {
         fields.append("Sec-WebSocket-Key: " + m_secWebSocketKey);
-        // FIXME: Current version of pywebsocket only accepts version value of 7,
-        // while hybi-10 requires this value to be 8. Should be fixed when
-        // a new version of pywebsocket is released.
-        fields.append("Sec-WebSocket-Version: 7");
+        fields.append("Sec-WebSocket-Version: 8");
     }
 
     // Fields in the handshake are sent by the client in a random order; the
@@ -352,7 +349,7 @@ WebSocketHandshakeRequest WebSocketHandshake::clientHandshakeRequest() const
         request.setKey3(m_hixie76Key3);
     } else {
         request.addHeaderField("Sec-WebSocket-Key", m_secWebSocketKey);
-        request.addHeaderField("Sec-WebSocket-Version", "7"); // FIXME: See FIXME in clientHandshakeMessage().
+        request.addHeaderField("Sec-WebSocket-Version", "8");
     }
 
     return request;
index 51c216a11a8e446c2a173dd2dbf20cc153efc86a..4992dcb281e183e6dfae456cfb501854a750c1c8 100644 (file)
@@ -1,3 +1,12 @@
+2011-07-14  Yuta Kitamura  <yutak@chromium.org>
+
+        WebSocket: Introduce pywebsocket-0.6b2
+        https://bugs.webkit.org/show_bug.cgi?id=64534
+
+        Reviewed by Kent Tamura.
+
+        * Scripts/webkitpy/thirdparty/__init__.py:
+
 2011-07-14  Dimitri Glazkov  <dglazkov@chromium.org>
 
         Introduce TestExpectationsModel, split out of TestExpectations.
index 325adefebf4c6f58581e3e0e83a162343ede1a38..fb07f33e93afda921ca8bb8cc39cf5b5dd568ea3 100644 (file)
@@ -123,8 +123,8 @@ class AutoinstallImportHook(object):
     def _install_pywebsocket(self):
         pywebsocket_dir = self._fs.join(_AUTOINSTALLED_DIR, "pywebsocket")
         installer = AutoInstaller(target_dir=pywebsocket_dir)
-        installer.install(url="http://pywebsocket.googlecode.com/files/mod_pywebsocket-0.6b1.tar.gz",
-                          url_subpath="pywebsocket-0.6b1/src/mod_pywebsocket")
+        installer.install(url="http://pywebsocket.googlecode.com/files/mod_pywebsocket-0.6b2.tar.gz",
+                          url_subpath="pywebsocket-0.6b2/src/mod_pywebsocket")
 
     def _install(self, url, url_subpath):
         installer = AutoInstaller(target_dir=_AUTOINSTALLED_DIR)