Diff
Modified: trunk/LayoutTests/ChangeLog (91051 => 91052)
--- trunk/LayoutTests/ChangeLog 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/LayoutTests/ChangeLog 2011-07-15 06:26:26 UTC (rev 91052)
@@ -1,3 +1,20 @@
+2011-07-14 Yuta Kitamura <[email protected]>
+
+ 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 <[email protected]>
<input form="x"> should not associate the input with any forms when there is no form with id="x"
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py (91051 => 91052)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py 2011-07-15 06:26:26 UTC (rev 91052)
@@ -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):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py (91051 => 91052)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py 2011-07-15 06:26:26 UTC (rev 91052)
@@ -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):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py (91051 => 91052)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py 2011-07-15 06:26:26 UTC (rev 91052)
@@ -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):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py (91051 => 91052)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py 2011-07-15 06:26:26 UTC (rev 91052)
@@ -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):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py (91051 => 91052)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py 2011-07-15 06:26:26 UTC (rev 91052)
@@ -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):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py (91051 => 91052)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py 2011-07-15 06:26:26 UTC (rev 91052)
@@ -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):
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-prepended-null_wsh.py (91051 => 91052)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-prepended-null_wsh.py 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-prepended-null_wsh.py 2011-07-15 06:26:26 UTC (rev 91052)
@@ -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):
Modified: trunk/Source/WebCore/ChangeLog (91051 => 91052)
--- trunk/Source/WebCore/ChangeLog 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/Source/WebCore/ChangeLog 2011-07-15 06:26:26 UTC (rev 91052)
@@ -1,3 +1,18 @@
+2011-07-14 Yuta Kitamura <[email protected]>
+
+ 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 <[email protected]>
Replaced isChecked() with shouldAppearChecked() in HTMLInputElement.cpp along with all the corresponding function calls.
Modified: trunk/Source/WebCore/websockets/WebSocketHandshake.cpp (91051 => 91052)
--- trunk/Source/WebCore/websockets/WebSocketHandshake.cpp 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/Source/WebCore/websockets/WebSocketHandshake.cpp 2011-07-15 06:26:26 UTC (rev 91052)
@@ -289,10 +289,7 @@
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 @@
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;
Modified: trunk/Tools/ChangeLog (91051 => 91052)
--- trunk/Tools/ChangeLog 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/Tools/ChangeLog 2011-07-15 06:26:26 UTC (rev 91052)
@@ -1,3 +1,12 @@
+2011-07-14 Yuta Kitamura <[email protected]>
+
+ 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 <[email protected]>
Introduce TestExpectationsModel, split out of TestExpectations.
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (91051 => 91052)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2011-07-15 06:07:29 UTC (rev 91051)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2011-07-15 06:26:26 UTC (rev 91052)
@@ -123,8 +123,8 @@
def _install_pywebsocket(self):
pywebsocket_dir = self._fs.join(_AUTOINSTALLED_DIR, "pywebsocket")
installer = AutoInstaller(target_dir=pywebsocket_dir)
- installer.install(url=""
- url_subpath="pywebsocket-0.6b1/src/mod_pywebsocket")
+ installer.install(url=""
+ url_subpath="pywebsocket-0.6b2/src/mod_pywebsocket")
def _install(self, url, url_subpath):
installer = AutoInstaller(target_dir=_AUTOINSTALLED_DIR)
