Changeset 52234 in webkit

Timestamp:

Dec 16, 2009 10:19:05 PM (14 years ago)

Author:

ukai@chromium.org

Message:

2009-12-16 Fumitoshi Ukai <​ukai@chromium.org>

Reviewed by Alexey Proskuryakov.

Fix flakiness in WebSocket handshake console message.
​https://bugs.webkit.org/show_bug.cgi?id=32598

In chromium, LayoutTests/websocket/tests/handshake-error.html is
flaky, because it outputs the following console message several times:

CONSOLE MESSAGE: line 0: Unexpected response code:101

Update m_mode in WebSocketHandshake correctly: Once it finds
error in handshake message, set m_mode to Failed and don't try
reading handshake message again. If handshake message is not yet
fully received, set m_mode to Incomplete, so next didReceiveData()
will try to check handshake message again.

• websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::didReceiveData):
• websockets/WebSocketHandshake.cpp: (WebCore::WebSocketHandshake::readServerHandshake):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• websockets/WebSocketChannel.cpp (modified) (2 diffs)
• websockets/WebSocketHandshake.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-16  Fumitoshi Ukai  <ukai@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix flakiness in WebSocket handshake console message.
+        https://bugs.webkit.org/show_bug.cgi?id=32598
+
+        In chromium, LayoutTests/websocket/tests/handshake-error.html is
+        flaky, because it outputs the following console message several times:
+          CONSOLE MESSAGE: line 0: Unexpected response code:101
+        Update m_mode in WebSocketHandshake correctly: Once it finds
+        error in handshake message, set m_mode to Failed and don't try
+        reading handshake message again.  If handshake message is not yet
+        fully received, set m_mode to Incomplete, so next didReceiveData()
+        will try to check handshake message again.
+
+        * websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::didReceiveData):
+        * websockets/WebSocketHandshake.cpp:
+        (WebCore::WebSocketHandshake::readServerHandshake):
+
 2009-12-16  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/websockets/WebSocketChannel.cpp

@@ -151 +151 @@
         return;
     }
-    if (m_handshake.mode() != WebSocketHandshake::Connected) {
+    if (m_handshake.mode() == WebSocketHandshake::Incomplete) {
         int headerLength = m_handshake.readServerHandshake(m_buffer, m_bufferSize);
         if (headerLength <= 0)
@@ -180 +180 @@
         LOG(Network, "remaining in read buf %ul", m_bufferSize);
     }
+    if (m_handshake.mode() != WebSocketHandshake::Connected)
+        return;
 
     const char* nextFrame = m_buffer;

trunk/WebCore/websockets/WebSocketHandshake.cpp

@@ -221 +221 @@
         }
         if (code.isEmpty()) {
+            m_mode = Failed;
             m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "No response code found: " + String(header, len), 0, clientOrigin());
             return len;
@@ -226 +227 @@
         LOG(Network, "response code: %s", code.utf8().data());
         if (code == "401") {
+            m_mode = Failed;
             m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Authentication required, but not implemented yet.", 0, clientOrigin());
             return len;
         } else {
+            m_mode = Failed;
             m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Unexpected response code:" + code, 0, clientOrigin());
             return len;
@@ -238 +241 @@
     if (m_mode == Normal) {
         size_t headerSize = end - p;
-        if (headerSize < sizeof(webSocketUpgradeHeader) - 1)
+        if (headerSize < sizeof(webSocketUpgradeHeader) - 1) {
+            m_mode = Incomplete;
             return 0;
+        }
         if (memcmp(p, webSocketUpgradeHeader, sizeof(webSocketUpgradeHeader) - 1)) {
+            m_mode = Failed;
             m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Bad Upgrade header: " + String(p, end - p), 0, clientOrigin());
             return p - header + sizeof(webSocketUpgradeHeader) - 1;
@@ -247 +253 @@
 
         headerSize = end - p;
-        if (headerSize < sizeof(webSocketConnectionHeader) - 1)
+        if (headerSize < sizeof(webSocketConnectionHeader) - 1) {
+            m_mode = Incomplete;
             return -1;
+        }
         if (memcmp(p, webSocketConnectionHeader, sizeof(webSocketConnectionHeader) - 1)) {
+            m_mode = Failed;
             m_context->addMessage(ConsoleDestination, JSMessageSource, LogMessageType, ErrorMessageLevel, "Bad Connection header: " + String(p, end - p), 0, clientOrigin());
             return p - header + sizeof(webSocketConnectionHeader) - 1;
@@ -258 +267 @@
     if (!strnstr(p, "\r\n\r\n", end - p)) {
         // Just hasn't been received fully yet.
+        m_mode = Incomplete;
         return -1;
     }