[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 53c402365cadf48dbfceebada3c109908d9903a7
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 30 23:48:50 2009 +0000

            Reviewed by Oliver Hunt.
    
            https://bugs.webkit.org/show_bug.cgi?id=31659
            Connection must be closed in case of Web Socket handshake error
    
            The network connection was closed, but the close event wasn't dispatched.
    
            Tested by websocket/tests/handshake-error.html, which is un-skipped now.
    
            * platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::platformClose):
            Call client didHandle() method. This looks strange in CFNetwork implementation, because
            it's the client that asked to close the stream, so it shouldn't need the callback. It makes
            more sense in cross-process implementation, because closing is async there.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7232df5..2e8fded 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-30  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31659
+        Connection must be closed in case of Web Socket handshake error
+
+        * platform/mac/Skipped: Un-skip websocket/tests/handshake-error.html.
+
 2009-11-30  Eric Carlson  <eric.carlson at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 20fa602..a362e94 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -108,6 +108,3 @@ 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/WebCore/ChangeLog b/WebCore/ChangeLog
index 4d531a0..4d0359d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,4 +1,20 @@
-2009-11-24  Gavin Barraclough  <barraclough at apple.com>
+2009-11-30  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31659
+        Connection must be closed in case of Web Socket handshake error
+
+        The network connection was closed, but the close event wasn't dispatched.
+
+        Tested by websocket/tests/handshake-error.html, which is un-skipped now.
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::platformClose):
+        Call client didHandle() method. This looks strange in CFNetwork implementation, because
+        it's the client that asked to close the stream, so it shouldn't need the callback. It makes
+        more sense in cross-process implementation, because closing is async there.
+
+2009-11-30  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Geoff Garen.
 
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
index 4e64bbd..904275b 100644
--- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
@@ -614,6 +614,8 @@ void SocketStreamHandle::platformClose()
     
     m_readStream = 0;
     m_writeStream = 0;
+
+    m_client->didClose(this);
 }
 
 void SocketStreamHandle::receivedCredential(const AuthenticationChallenge&, const Credential&)

-- 
WebKit Debian packaging