Title: [90196] trunk/LayoutTests
- Revision
- 90196
- Author
- [email protected]
- Date
- 2011-06-30 19:55:49 -0700 (Thu, 30 Jun 2011)
Log Message
2011-06-30 Yuta Kitamura <[email protected]>
Reviewed by Kent Tamura.
WebSocket: Don't use old Hixie75 handshake in pywebsocket handlers
https://bugs.webkit.org/show_bug.cgi?id=63704
* http/tests/websocket/tests/bad-handshake-crash_wsh.py:
Use handshake format of Hixie's protocol draft 76 which we are currently supporting.
* http/tests/websocket/tests/long-invalid-header_wsh.py:
Content of web_socket_transfer_data() is completely bogus. It's not necessary.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (90195 => 90196)
--- trunk/LayoutTests/ChangeLog 2011-07-01 02:52:59 UTC (rev 90195)
+++ trunk/LayoutTests/ChangeLog 2011-07-01 02:55:49 UTC (rev 90196)
@@ -1,3 +1,15 @@
+2011-06-30 Yuta Kitamura <[email protected]>
+
+ Reviewed by Kent Tamura.
+
+ WebSocket: Don't use old Hixie75 handshake in pywebsocket handlers
+ https://bugs.webkit.org/show_bug.cgi?id=63704
+
+ * http/tests/websocket/tests/bad-handshake-crash_wsh.py:
+ Use handshake format of Hixie's protocol draft 76 which we are currently supporting.
+ * http/tests/websocket/tests/long-invalid-header_wsh.py:
+ Content of web_socket_transfer_data() is completely bogus. It's not necessary.
+
2011-06-30 Kent Tamura <[email protected]>
Reviewed by Darin Fisher.
Modified: trunk/LayoutTests/http/tests/websocket/tests/bad-handshake-crash_wsh.py (90195 => 90196)
--- trunk/LayoutTests/http/tests/websocket/tests/bad-handshake-crash_wsh.py 2011-07-01 02:52:59 UTC (rev 90195)
+++ trunk/LayoutTests/http/tests/websocket/tests/bad-handshake-crash_wsh.py 2011-07-01 02:55:49 UTC (rev 90196)
@@ -1,9 +1,12 @@
def web_socket_do_extra_handshake(request):
- msg = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
+ msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
msg += "Upgrade: WebSocket\r\n"
msg += "Connection: Upgrade\r\n"
+ msg += "Sec-WebSocket-Location: " + request.ws_location + "\r\n"
+ msg += "Sec-WebSocket-Origin: " + request.ws_origin + "\r\n"
msg += "\xa5:\r\n"
msg += "\r\n"
+ msg += request.ws_challenge_md5
request.connection.write(msg)
print msg
Modified: trunk/LayoutTests/http/tests/websocket/tests/long-invalid-header_wsh.py (90195 => 90196)
--- trunk/LayoutTests/http/tests/websocket/tests/long-invalid-header_wsh.py 2011-07-01 02:52:59 UTC (rev 90195)
+++ trunk/LayoutTests/http/tests/websocket/tests/long-invalid-header_wsh.py 2011-07-01 02:55:49 UTC (rev 90196)
@@ -1,10 +1,8 @@
def web_socket_do_extra_handshake(request):
- msg = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
+ msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
msg += ("p" * 1024) + "\r\n"
request.connection.write(msg)
def web_socket_transfer_data(request):
- msg = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
- msg += ("p" * 1024) + "\r\n"
- request.connection.write(msg)
+ pass
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
