[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ap at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 87995de71be64e1cb178768946161d15efe5d44a
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 30 21:35:04 2009 +0000

    2009-11-30  Yuzo Fujishima  <yuzo at google.com>
    
            Reviewed by Eric Seidel.
    
            In testing handshake-error case, web_socket_do_extra_handshake calls a non-existent method
            https://bugs.webkit.org/show_bug.cgi?id=31465
    
            * platform/mac/Skipped: websocket/tests/handshake-error.html now fails on Mac, added to
            Skipped list, and filed bug 31659 to investigate.
    
            * websocket/tests/handshake-error_wsh.py: Call write() on a correct object.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51508 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 93abc87..c1e7b0d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-30  Yuzo Fujishima  <yuzo at google.com>
+
+        Reviewed by Eric Seidel.
+
+        In testing handshake-error case, web_socket_do_extra_handshake calls a non-existent method
+        https://bugs.webkit.org/show_bug.cgi?id=31465
+
+        * platform/mac/Skipped: websocket/tests/handshake-error.html now fails on Mac, added to
+        Skipped list, and filed bug 31659 to investigate.
+
+        * websocket/tests/handshake-error_wsh.py: Call write() on a correct object.
+
 2009-11-30  Joseph Pecoraro  <joepeck at webkit.org>
 
         Reviewed by Pavel Feldman.
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index a362e94..20fa602 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -108,3 +108,6 @@ plugins/reloadplugins-no-pages.html
 
 # These test require Qt Widgets
 plugins/qt-qwidget-plugin.html
+
+# Skipped until https://bugs.webkit.org/show_bug.cgi?id=31659 is fixed.
+websocket/tests/handshake-error.html
diff --git a/LayoutTests/websocket/tests/handshake-error_wsh.py b/LayoutTests/websocket/tests/handshake-error_wsh.py
index dbc707a..c67d3a4 100644
--- a/LayoutTests/websocket/tests/handshake-error_wsh.py
+++ b/LayoutTests/websocket/tests/handshake-error_wsh.py
@@ -31,7 +31,7 @@ from mod_pywebsocket import msgutil
 
 
 def web_socket_do_extra_handshake(request):
-    request.write('ThisWillCauseHandshakeError')
+    request.connection.write('ThisWillCauseHandshakeError')
 
 
 def web_socket_transfer_data(request):

-- 
WebKit Debian packaging