Changeset 53317 in webkit

Timestamp:

Jan 14, 2010 8:56:47 PM (14 years ago)

Author:

ukai@chromium.org

Message:

2010-01-14 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Alexey Proskuryakov.

Update pywebsocket to 0.4.6
​https://bugs.webkit.org/show_bug.cgi?id=32299
The newer pywebsocket can handle more simultaneous connections.

• pywebsocket/mod_pywebsocket/handshake.py:
• pywebsocket/mod_pywebsocket/standalone.py:
• pywebsocket/setup.py:
• pywebsocket/test/test_handshake.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• pywebsocket/mod_pywebsocket/handshake.py (modified) (1 diff)
• pywebsocket/mod_pywebsocket/standalone.py (modified) (3 diffs)
• pywebsocket/setup.py (modified) (1 diff)
• pywebsocket/test/test_handshake.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-14  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Update pywebsocket to 0.4.6
+        https://bugs.webkit.org/show_bug.cgi?id=32299
+        The newer pywebsocket can handle more simultaneous connections.
+
+        * pywebsocket/mod_pywebsocket/handshake.py:
+        * pywebsocket/mod_pywebsocket/standalone.py:
+        * pywebsocket/setup.py:
+        * pywebsocket/test/test_handshake.py:
+
 2010-01-14  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/pywebsocket/mod_pywebsocket/handshake.py

@@ -64 +64 @@
 ])
 
-# FIXME: Cookie headers also being in restricted WebSocket syntax.
 _SIXTH_AND_LATER = re.compile(
     r'^'
     r'(WebSocket-Protocol: [\x20-\x7e]+\r\n)?'
-    r'([Cc][Oo][Oo][Kk][Ii][Ee]:[^\r]*\r\n)*'
-    r'([Cc][Oo][Oo][Kk][Ii][Ee]2:[^\r]*\r\n)?'
-    r'([Cc][Oo][Oo][Kk][Ii][Ee]:[^\r]*\r\n)*'
+    r'(Cookie: [^\r]*\r\n)*'
+    r'(Cookie2: [^\r]*\r\n)?'
+    r'(Cookie: [^\r]*\r\n)*'
     r'\r\n')
-
 
 

trunk/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py

@@ -89 +89 @@
 _DEFAULT_LOG_MAX_BYTES = 1024 * 256
 _DEFAULT_LOG_BACKUP_COUNT = 5
+
+_DEFAULT_REQUEST_QUEUE_SIZE = 128
 
 # 1024 is practically large enough to contain WebSocket handshake lines.
@@ -315 +317 @@
     parser.add_option('--strict', dest='strict', action='store_true',
                       default=False, help='Strictly check handshake request')
+    parser.add_option('-q', '--queue', dest='request_queue_size', type='int',
+                      default=_DEFAULT_REQUEST_QUEUE_SIZE,
+                      help='request queue size')
     options = parser.parse_args()[0]
 
@@ -320 +325 @@
 
     _configure_logging(options)
+
+    SocketServer.TCPServer.request_queue_size = options.request_queue_size
 
     if options.use_tls:

trunk/WebKitTools/pywebsocket/setup.py

@@ -57 +57 @@
       packages=[_PACKAGE_NAME],
       url='http://code.google.com/p/pywebsocket/',
-      version='0.4.5',
+      version='0.4.6',
       )
 

trunk/WebKitTools/pywebsocket/test/test_handshake.py

@@ -349 +349 @@
         '\r\n',
     ),
+    (  # Wrong-case cookie
+        'GET /demo HTTP/1.1\r\n',
+        'Upgrade: WebSocket\r\n',
+        'Connection: Upgrade\r\n',
+        'Host: example.com\r\n',
+        'Origin: http://example.com\r\n',
+        'cookie: abc/xyz\r\n'
+        '\r\n',
+    ),
+    (  # Cookie, no space after colon
+        'GET /demo HTTP/1.1\r\n',
+        'Upgrade: WebSocket\r\n',
+        'Connection: Upgrade\r\n',
+        'Host: example.com\r\n',
+        'Origin: http://example.com\r\n',
+        'Cookie:abc/xyz\r\n'
+        '\r\n',
+    ),
 )