Changeset 80092 in webkit

Timestamp:

Mar 1, 2011 10:06:10 PM (13 years ago)

Author:

yutak@chromium.org

Message:

2011-03-01 Yuta Kitamura <​yutak@chromium.org>

Reviewed by Darin Adler.

REGRESSION(r78383): Failure to connect on websocketstest.com
​https://bugs.webkit.org/show_bug.cgi?id=54811

After r78383, KURL::setPort() no longer appends ":port" part
if that port is the default port for URL scheme. This broke
SocketStreamHandleCFNet, whose code was based on an assumption
that KURL::setPort() always inserts ":port" part.

To fix this, KURL::port() call is removed from SocketStreamHandle
and the port number is calculated on-the-fly.

Unfortunately it is impossible to write a test; this bug only
affects WebSockets connecting to the default port (port 80
for ws, port 443 for wss), while we use different ports to test
WebSockets in LayoutTests.

• platform/network/cf/SocketStreamHandle.h:
• platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::SocketStreamHandle): (WebCore::SocketStreamHandle::createStreams): (WebCore::SocketStreamHandle::port):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cf/SocketStreamHandle.h (modified) (1 diff)
• platform/network/cf/SocketStreamHandleCFNet.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-01  Yuta Kitamura  <yutak@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION(r78383): Failure to connect on websocketstest.com
+        https://bugs.webkit.org/show_bug.cgi?id=54811
+
+        After r78383, KURL::setPort() no longer appends ":port" part
+        if that port is the default port for URL scheme. This broke
+        SocketStreamHandleCFNet, whose code was based on an assumption
+        that KURL::setPort() always inserts ":port" part.
+
+        To fix this, KURL::port() call is removed from SocketStreamHandle
+        and the port number is calculated on-the-fly.
+
+        Unfortunately it is impossible to write a test; this bug only
+        affects WebSockets connecting to the default port (port 80
+        for ws, port 443 for wss), while we use different ports to test
+        WebSockets in LayoutTests.
+
+        * platform/network/cf/SocketStreamHandle.h:
+        * platform/network/cf/SocketStreamHandleCFNet.cpp:
+        (WebCore::SocketStreamHandle::SocketStreamHandle):
+        (WebCore::SocketStreamHandle::createStreams):
+        (WebCore::SocketStreamHandle::port):
+
 2011-03-01  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h

@@ -73 +73 @@
 
     bool shouldUseSSL() const { return m_url.protocolIs("wss"); }
+    unsigned short port() const;
 
     void addCONNECTCredentials(CFHTTPMessageRef response);

trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp

@@ -70 +70 @@
     ASSERT(url.protocolIs("ws") || url.protocolIs("wss"));
 
-    if (!m_url.port())
-        m_url.setPort(shouldUseSSL() ? 443 : 80);
-
     KURL httpsURL(KURL(), "https://" + m_url.host());
     m_httpsURL.adoptCF(httpsURL.createCFURL());
@@ -319 +316 @@
     CFReadStreamRef readStream = 0;
     CFWriteStreamRef writeStream = 0;
-    CFStreamCreatePairWithSocketToHost(0, host.get(), m_url.port(), &readStream, &writeStream);
+    CFStreamCreatePairWithSocketToHost(0, host.get(), port(), &readStream, &writeStream);
 
     m_readStream.adoptCF(readStream);
@@ -674 +671 @@
 }
 
+unsigned short SocketStreamHandle::port() const
+{
+    if (unsigned short urlPort = m_url.port())
+        return urlPort;
+    if (shouldUseSSL())
+        return 443;
+    return 80;
+}
+
 }  // namespace WebCore