Unreviewed, rolling out r94055 and r94057.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Aug 2011 10:05:31 +0000 (10:05 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Aug 2011 10:05:31 +0000 (10:05 +0000)
http://trac.webkit.org/changeset/94055
http://trac.webkit.org/changeset/94057
https://bugs.webkit.org/show_bug.cgi?id=67191

Many failures on Mac 10.5 (Requested by toyoshim on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2011-08-30

Tools:

* Scripts/webkitpy/thirdparty/__init__.py:

LayoutTests:

* http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py:
* http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py:
* http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py:
* http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py:
* http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py:
* http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py:
* http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py:
* http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py:
* http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py:
* 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-accept-header_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-wrong-accept-header_wsh.py:
* http/tests/websocket/tests/hybi/long-invalid-header_wsh.py:
* http/tests/websocket/tests/hybi/masked-frames_wsh.py:

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

22 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py
LayoutTests/http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py
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-accept-header_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-wrong-accept-header_wsh.py
LayoutTests/http/tests/websocket/tests/hybi/long-invalid-header_wsh.py
LayoutTests/http/tests/websocket/tests/hybi/masked-frames_wsh.py
Tools/ChangeLog
Tools/Scripts/webkitpy/thirdparty/__init__.py

index 24cd166..b5184e7 100644 (file)
@@ -1,3 +1,32 @@
+2011-08-30  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r94055 and r94057.
+        http://trac.webkit.org/changeset/94055
+        http://trac.webkit.org/changeset/94057
+        https://bugs.webkit.org/show_bug.cgi?id=67191
+
+        Many failures on Mac 10.5 (Requested by toyoshim on #webkit).
+
+        * http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py:
+        * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py:
+        * http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py:
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py:
+        * http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py:
+        * 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-accept-header_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-wrong-accept-header_wsh.py:
+        * http/tests/websocket/tests/hybi/long-invalid-header_wsh.py:
+        * http/tests/websocket/tests/hybi/masked-frames_wsh.py:
+
 2011-08-30  Renata Hodovan  <reni@webkit.org>
 
         [Qt] Qt Linux Release bot has four failed tests.
index e3e96ef..7b425bc 100644 (file)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
     msg += "Upgrade: WebSocket\r\n"
@@ -12,7 +9,7 @@ def web_socket_do_extra_handshake(request):
     msg += request.ws_challenge_md5
     request.connection.write(msg)
     print msg
-    raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
+    raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 2bd8937..c34b4f1 100644 (file)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     pass
 
@@ -11,4 +8,4 @@ def web_socket_transfer_data(request):
     msg += "\x01\xff"
     msg += "\0should be skipped\xff"
     request.connection.write(msg)
-    raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from starting closing handshake.
+    raise Exception("Abort the connection") # Prevents pywebsocket from starting closing handshake.
index f2abbb2..1c7c921 100644 (file)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     pass
 
@@ -8,4 +5,4 @@ def web_socket_do_extra_handshake(request):
 def web_socket_transfer_data(request):
     msg = 16 * '\xff'
     request.connection.write(msg)
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from starting closing handshake.
+    raise Exception('Abort the connection') # Prevents pywebsocket from starting closing handshake.
index c81d37b..c039fb3 100644 (file)
@@ -20,9 +20,6 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     # This will cause the handshake to fail because it pushes the length of the
     # status line past 1024 characters
@@ -35,7 +32,7 @@ def web_socket_do_extra_handshake(request):
     msg += '\r\n'
     msg += request.ws_challenge_md5
     request.connection.write(msg)
-    raise handshake.AbortedByUserException('abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 1152476..7efc87a 100644 (file)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
     msg += 'Upgrade: WebSocket\r\n'
@@ -11,7 +8,7 @@ def web_socket_do_extra_handshake(request):
     msg += request.ws_challenge_md5
     request.connection.write(msg)
     print msg
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 2a360e5..978924a 100644 (file)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\n' # Does not end with "\r\n".
     msg += 'Upgrade: WebSocket\r\n'
@@ -11,7 +8,7 @@ def web_socket_do_extra_handshake(request):
     msg += request.ws_challenge_md5
     request.connection.write(msg)
     print msg
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 436197c..114de75 100644 (file)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
 #   Missing 'Upgrade: WebSocket\r\n'
@@ -11,7 +8,7 @@ def web_socket_do_extra_handshake(request):
     msg += request.ws_challenge_md5
     request.connection.write(msg)
     print msg
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 2176068..0735184 100644 (file)
@@ -20,7 +20,6 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import time
-from mod_pywebsocket import handshake
 
 
 def web_socket_do_extra_handshake(request):
@@ -45,10 +44,7 @@ def web_socket_do_extra_handshake(request):
         time.sleep(1)
         numFrames = 1024 / len(frame) # write over 1024 bytes including the above handshake
         for i in range(0, numFrames):
-            try:
-                request.connection.write(frame)
-            except Exception, e:
-                raise handshake.AbortedByUserException(e)
+            request.connection.write(frame)
 
 
 def web_socket_transfer_data(request):
index e953230..4a169f3 100644 (file)
@@ -1,13 +1,10 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
     msg += ("p" * 1024) + "\r\n"
     msg += "\r\n"
     msg += request.ws_challenge_md5
     request.connection.write(msg)
-    raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
+    raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index f3a2feb..fe57779 100644 (file)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
 from mod_pywebsocket.handshake.hybi import compute_accept
 
 
@@ -11,7 +10,7 @@ def web_socket_do_extra_handshake(request):
     msg += "\r\n"
     request.connection.write(msg)
     print msg
-    raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
+    raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index ecfe41f..da1f9df 100644 (file)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
 from mod_pywebsocket.handshake.hybi import compute_accept
 
 
@@ -10,7 +9,7 @@ def web_socket_do_extra_handshake(request):
     message += 'Sec-WebSocket-Extensions: x-foo\r\n'
     message += '\r\n'
     request.connection.write(message)
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 847114c..b277939 100644 (file)
@@ -20,7 +20,6 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-from mod_pywebsocket import handshake
 from mod_pywebsocket.handshake.hybi import compute_accept
 
 
@@ -34,7 +33,7 @@ def web_socket_do_extra_handshake(request):
     msg += 'Sec-WebSocket-Accept: %s\r\n' % compute_accept(request.headers_in['Sec-WebSocket-Key'])[0]
     msg += '\r\n'
     request.connection.write(msg)
-    raise handshake.AbortedByUserException('abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 48acdc1..541a66d 100644 (file)
@@ -1,13 +1,10 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     message = 'HTTP/1.1 101 Switching Protocols\r\n'
     message += 'Upgrade: websocket\r\n'
     message += 'Connection: Upgrade\r\n'
     message += '\r\n'
     request.connection.write(message)
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 1b022f5..8e4225d 100644 (file)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
 from mod_pywebsocket.handshake.hybi import compute_accept
 
 
@@ -10,7 +9,7 @@ def web_socket_do_extra_handshake(request):
     msg += '\r\n'
     request.connection.write(msg)
     print msg
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 6cb34c2..cf9a97e 100644 (file)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
 from mod_pywebsocket.handshake.hybi import compute_accept
 
 
@@ -10,7 +9,7 @@ def web_socket_do_extra_handshake(request):
     msg += '\r\n'
     request.connection.write(msg)
     print msg
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 97ce128..d77e089 100644 (file)
@@ -1,4 +1,3 @@
-from mod_pywebsocket import handshake
 from mod_pywebsocket.handshake.hybi import compute_accept
 
 
@@ -10,7 +9,7 @@ def web_socket_do_extra_handshake(request):
     msg += '\r\n'
     request.connection.write(msg)
     print msg
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 7c969c8..d4a028b 100644 (file)
@@ -1,6 +1,3 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     message = 'HTTP/1.1 101 Switching Protocols\r\n'
     message += 'Upgrade: websocket\r\n'
@@ -8,7 +5,7 @@ def web_socket_do_extra_handshake(request):
     message += 'Sec-WebSocket-Accept: XXXXthisiswrongXXXX\r\n'
     message += '\r\n'
     request.connection.write(message)
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
+    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 9201e90..26d6af9 100644 (file)
@@ -1,12 +1,9 @@
-from mod_pywebsocket import handshake
-
-
 def web_socket_do_extra_handshake(request):
     msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
     msg += ("p" * 1024) + "\r\n"
     msg += "\r\n"
     request.connection.write(msg)
-    raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
+    raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
 
 
 def web_socket_transfer_data(request):
index 2d03b67..209967a 100644 (file)
@@ -1,5 +1,4 @@
 from mod_pywebsocket import common
-from mod_pywebsocket import handshake
 from mod_pywebsocket import stream
 from mod_pywebsocket import msgutil
 
@@ -32,4 +31,4 @@ def web_socket_transfer_data(request):
     # the WebSocket object should be closed cleanly.
     request.connection.write(stream.create_close_frame('', mask=True))
 
-    raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from starting its own closing handshake.
+    raise Exception('Abort the connection') # Prevents pywebsocket from starting its own closing handshake.
index e153469..a5e8092 100644 (file)
@@ -1,3 +1,14 @@
+2011-08-30  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r94055 and r94057.
+        http://trac.webkit.org/changeset/94055
+        http://trac.webkit.org/changeset/94057
+        https://bugs.webkit.org/show_bug.cgi?id=67191
+
+        Many failures on Mac 10.5 (Requested by toyoshim on #webkit).
+
+        * Scripts/webkitpy/thirdparty/__init__.py:
+
 2011-08-30  Adam Barth  <abarth@webkit.org>
 
         Chromium Android should not be a core builder
index 9a09799..f0a7c48 100644 (file)
@@ -139,8 +139,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.6b4.tar.gz",
-                          url_subpath="pywebsocket-0.6b4/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)