⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 94064 in webkit


Ignore:
Timestamp:
Aug 30, 2011, 3:05:31 AM (15 years ago)
Author:
commit-queue@webkit.org
Message:

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).

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:
Location:
trunk
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r94062 r94064  
     12011-08-30  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r94055 and r94057.
     4        http://trac.webkit.org/changeset/94055
     5        http://trac.webkit.org/changeset/94057
     6        https://bugs.webkit.org/show_bug.cgi?id=67191
     7
     8        Many failures on Mac 10.5 (Requested by toyoshim on #webkit).
     9
     10        * http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py:
     11        * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py:
     12        * http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py:
     13        * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py:
     14        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py:
     15        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py:
     16        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py:
     17        * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py:
     18        * http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py:
     19        * http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py:
     20        * http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py:
     21        * http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py:
     22        * http/tests/websocket/tests/hybi/handshake-fail-by-no-accept-header_wsh.py:
     23        * http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py:
     24        * http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py:
     25        * http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py:
     26        * http/tests/websocket/tests/hybi/handshake-fail-by-wrong-accept-header_wsh.py:
     27        * http/tests/websocket/tests/hybi/long-invalid-header_wsh.py:
     28        * http/tests/websocket/tests/hybi/masked-frames_wsh.py:
     29
    1302011-08-30  Renata Hodovan  <reni@webkit.org>
    231

  • trunk/LayoutTests/http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
    … …  
    1310    request.connection.write(msg)
    1411    print msg
    15     raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
     12    raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
    1613
    1714

  • trunk/LayoutTests/http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    pass
    … …  
    129    msg += "\0should be skipped\xff"
    1310    request.connection.write(msg)
    14     raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from starting closing handshake.
     11    raise Exception("Abort the connection") # Prevents pywebsocket from starting closing handshake.

  • trunk/LayoutTests/http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    pass
    … …  
    96    msg = 16 * '\xff'
    107    request.connection.write(msg)
    11     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from starting closing handshake.
     8    raise Exception('Abort the connection') # Prevents pywebsocket from starting closing handshake.

  • trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py

    r94057 r94064  
    2121
    2222
    23 from mod_pywebsocket import handshake
    24 
    25 
    2623def web_socket_do_extra_handshake(request):
    2724    # This will cause the handshake to fail because it pushes the length of the
    … …  
    3633    msg += request.ws_challenge_md5
    3734    request.connection.write(msg)
    38     raise handshake.AbortedByUserException('abort the connection') # Prevents pywebsocket from sending its own handshake message.
     35    raise Exception('abort the connection') # Prevents pywebsocket from sending its own handshake message.
    3936
    4037

  • trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
    … …  
    129    request.connection.write(msg)
    1310    print msg
    14     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
     11    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
    1512
    1613

  • trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\n' # Does not end with "\r\n".
    … …  
    129    request.connection.write(msg)
    1310    print msg
    14     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
     11    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
    1512
    1613

  • trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    msg = 'HTTP/1.1 101 WebSocket Protocol Handshake\r\n'
    … …  
    129    request.connection.write(msg)
    1310    print msg
    14     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
     11    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
    1512
    1613

  • trunk/LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py

    r94057 r94064  
    2121
    2222import time
    23 from mod_pywebsocket import handshake
    2423
    2524
    … …  
    4645        numFrames = 1024 / len(frame) # write over 1024 bytes including the above handshake
    4746        for i in range(0, numFrames):
    48             try:
    49                 request.connection.write(frame)
    50             except Exception, e:
    51                 raise handshake.AbortedByUserException(e)
     47            request.connection.write(frame)
    5248
    5349

  • trunk/LayoutTests/http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
    … …  
    85    msg += request.ws_challenge_md5
    96    request.connection.write(msg)
    10     raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
     7    raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
    118
    129

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/bad-handshake-crash_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    21from mod_pywebsocket.handshake.hybi import compute_accept
    32
    … …  
    1211    request.connection.write(msg)
    1312    print msg
    14     raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
     13    raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
    1514
    1615

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    21from mod_pywebsocket.handshake.hybi import compute_accept
    32
    … …  
    1110    message += '\r\n'
    1211    request.connection.write(message)
    13     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
     12    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
    1413
    1514

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-maxlength_wsh.py

    r94057 r94064  
    2121
    2222
    23 from mod_pywebsocket import handshake
    2423from mod_pywebsocket.handshake.hybi import compute_accept
    2524
    … …  
    3534    msg += '\r\n'
    3635    request.connection.write(msg)
    37     raise handshake.AbortedByUserException('abort the connection') # Prevents pywebsocket from sending its own handshake message.
     36    raise Exception('abort the connection') # Prevents pywebsocket from sending its own handshake message.
    3837
    3938

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-accept-header_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    message = 'HTTP/1.1 101 Switching Protocols\r\n'
    … …  
    85    message += '\r\n'
    96    request.connection.write(message)
    10     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
     7    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
    118
    129

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-connection-header_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    21from mod_pywebsocket.handshake.hybi import compute_accept
    32
    … …  
    1110    request.connection.write(msg)
    1211    print msg
    13     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
     12    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
    1413
    1514

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-cr_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    21from mod_pywebsocket.handshake.hybi import compute_accept
    32
    … …  
    1110    request.connection.write(msg)
    1211    print msg
    13     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
     12    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
    1413
    1514

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-no-upgrade-header_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    21from mod_pywebsocket.handshake.hybi import compute_accept
    32
    … …  
    1110    request.connection.write(msg)
    1211    print msg
    13     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
     12    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
    1413
    1514

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/handshake-fail-by-wrong-accept-header_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    message = 'HTTP/1.1 101 Switching Protocols\r\n'
    … …  
    96    message += '\r\n'
    107    request.connection.write(message)
    11     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
     8    raise Exception('Abort the connection') # Prevents pywebsocket from sending its own handshake message.
    129
    1310

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/long-invalid-header_wsh.py

    r94057 r94064  
    1 from mod_pywebsocket import handshake
    2 
    3 
    41def web_socket_do_extra_handshake(request):
    52    msg = "HTTP/1.1 101 WebSocket Protocol Handshake\r\n"
    … …  
    74    msg += "\r\n"
    85    request.connection.write(msg)
    9     raise handshake.AbortedByUserException("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
     6    raise Exception("Abort the connection") # Prevents pywebsocket from sending its own handshake message.
    107
    118

  • trunk/LayoutTests/http/tests/websocket/tests/hybi/masked-frames_wsh.py

    r94057 r94064  
    11from mod_pywebsocket import common
    2 from mod_pywebsocket import handshake
    32from mod_pywebsocket import stream
    43from mod_pywebsocket import msgutil
    … …  
    3332    request.connection.write(stream.create_close_frame('', mask=True))
    3433
    35     raise handshake.AbortedByUserException('Abort the connection') # Prevents pywebsocket from starting its own closing handshake.
     34    raise Exception('Abort the connection') # Prevents pywebsocket from starting its own closing handshake.

  • trunk/Tools/ChangeLog

    r94060 r94064  
     12011-08-30  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r94055 and r94057.
     4        http://trac.webkit.org/changeset/94055
     5        http://trac.webkit.org/changeset/94057
     6        https://bugs.webkit.org/show_bug.cgi?id=67191
     7
     8        Many failures on Mac 10.5 (Requested by toyoshim on #webkit).
     9
     10        * Scripts/webkitpy/thirdparty/__init__.py:
     11
    1122011-08-30  Adam Barth  <abarth@webkit.org>
    213

  • trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py

    r94055 r94064  
    140140        pywebsocket_dir = self._fs.join(_AUTOINSTALLED_DIR, "pywebsocket")
    141141        installer = AutoInstaller(target_dir=pywebsocket_dir)
    142         installer.install(url="http://pywebsocket.googlecode.com/files/mod_pywebsocket-0.6b4.tar.gz",
    143                           url_subpath="pywebsocket-0.6b4/src/mod_pywebsocket")
     142        installer.install(url="http://pywebsocket.googlecode.com/files/mod_pywebsocket-0.6b2.tar.gz",
     143                          url_subpath="pywebsocket-0.6b2/src/mod_pywebsocket")
    144144
    145145    def _install(self, url, url_subpath):
Note: See TracChangeset for help on using the changeset viewer.