Changeset 101974 in webkit

Timestamp:

Dec 4, 2011, 11:42:19 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Add binary support in WebSocket test server's echo handler.
​https://bugs.webkit.org/show_bug.cgi?id=73649

Patch by Takashi Toyoshima <​toyoshim@chromium.org> on 2011-12-04
Reviewed by Eric Seidel.

• http/tests/websocket/tests/hybi/echo_wsh.py: Support binary frames.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/websocket/tests/hybi/echo_wsh.py (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-12-04  Takashi Toyoshima  <toyoshim@chromium.org>
+
+        Add binary support in WebSocket test server's echo handler.
+        https://bugs.webkit.org/show_bug.cgi?id=73649
+
+        Reviewed by Eric Seidel.
+
+        * http/tests/websocket/tests/hybi/echo_wsh.py: Support binary frames.
+
 2011-12-04  Kent Tamura  <tkent@chromium.org>
 

trunk/LayoutTests/http/tests/websocket/tests/hybi/echo_wsh.py

@@ -1 @@
-# Copyright 2009, Google Inc.
+# Copyright 2009, 2011, Google Inc.
 # All rights reserved.
 #
@@ -29 +29 @@
 
 
-from mod_pywebsocket import msgutil
-
-
-_GOODBYE_MESSAGE = 'Goodbye'
+_GOODBYE_MESSAGE = u'Goodbye'
 
 
@@ -41 +38 @@
 def web_socket_transfer_data(request):
     while True:
-        line = msgutil.receive_message(request)
-        msgutil.send_message(request, line)
-        if line == _GOODBYE_MESSAGE:
+        line = request.ws_stream.receive_message()
+        if line is None:
             return
+        if isinstance(line, unicode):
+            request.ws_stream.send_message(line, binary=False)
+            if line == _GOODBYE_MESSAGE:
+                return
+        else:
+            request.ws_stream.send_message(line, binary=True)