[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[ap at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit add6e215afd595c5bc745a05aaf7a5450d4788f6
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 5 23:59:24 2009 +0000

            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=32175
            REGRESSION: websocket/tests/url-parsing.html is crashing on Leopard Bot
    
            * platform/network/cf/SocketStreamHandleCFNet.cpp:
            (WebCore::SocketStreamHandle::readStreamCallback): Call platformClose() to unschedule both
            streams, guaranteeing that there will be no callbacks after SocketStreamHandle is destroyed.
            (WebCore::SocketStreamHandle::writeStreamCallback): Edited a comment a bit.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51732 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 93631dc..72bfcc2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-05  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32175
+        REGRESSION: websocket/tests/url-parsing.html is crashing on Leopard Bot
+
+        * platform/network/cf/SocketStreamHandleCFNet.cpp:
+        (WebCore::SocketStreamHandle::readStreamCallback): Call platformClose() to unschedule both
+        streams, guaranteeing that there will be no callbacks after SocketStreamHandle is destroyed.
+        (WebCore::SocketStreamHandle::writeStreamCallback): Edited a comment a bit.
+
 2009-12-05  Adam Langley  <agl at google.com>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
index 904275b..ac4f88c 100644
--- a/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
+++ b/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp
@@ -529,7 +529,7 @@ void SocketStreamHandle::readStreamCallback(CFStreamEventType type)
         break;
     }
     case kCFStreamEventEndEncountered:
-        m_client->didClose(this);
+        platformClose();
         break;
     }
 }
@@ -571,7 +571,7 @@ void SocketStreamHandle::writeStreamCallback(CFStreamEventType type)
         break;
     }
     case kCFStreamEventEndEncountered:
-        // FIXME: Currently, we call didClose from read callback, but these can come independently (e.g. a server can stop listening, but keep sending data).
+        // FIXME: Currently, we handle closing in read callback, but these can come independently (e.g. a server can stop listening, but keep sending data).
         break;
     }
 }

-- 
WebKit Debian packaging