Changeset 109941 in webkit

Timestamp:

Mar 6, 2012 11:50:48 AM (12 years ago)

Author:

senorblanco@chromium.org

Message:

Unreviewed, rolling out r109840.
​http://trac.webkit.org/changeset/109840
​https://bugs.webkit.org/show_bug.cgi?id=80103

Broke WebSocket tests on Chrome Mac and Linux

Source/WebCore:

• Modules/websockets/WebSocket.cpp:

(WebCore::WebSocket::send):
(WebCore::WebSocket::close):

• Modules/websockets/WebSocketChannel.cpp:

(WebCore::WebSocketChannel::send):

LayoutTests:

• http/tests/websocket/tests/hybi/close-expected.txt:
• http/tests/websocket/tests/hybi/unpaired-surrogates-in-close-reason-expected.txt: Removed.
• http/tests/websocket/tests/hybi/unpaired-surrogates-in-close-reason.html: Removed.
• http/tests/websocket/tests/hybi/unpaired-surrogates-in-message-expected.txt: Removed.
• http/tests/websocket/tests/hybi/unpaired-surrogates-in-message.html: Removed.
• http/tests/websocket/tests/hybi/workers/close-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/websocket/tests/hybi/close-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/websocket/tests/hybi/unpaired-surrogates-in-close-reason-expected.txt (deleted)
• LayoutTests/http/tests/websocket/tests/hybi/unpaired-surrogates-in-close-reason.html (deleted)
• LayoutTests/http/tests/websocket/tests/hybi/unpaired-surrogates-in-message-expected.txt (deleted)
• LayoutTests/http/tests/websocket/tests/hybi/unpaired-surrogates-in-message.html (deleted)
• LayoutTests/http/tests/websocket/tests/hybi/workers/close-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/websockets/WebSocket.cpp (modified) (2 diffs)
• Source/WebCore/Modules/websockets/WebSocketChannel.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-06  Stephen White  <senorblanco@chromium.org>
+
+        Unreviewed, rolling out r109840.
+        http://trac.webkit.org/changeset/109840
+        https://bugs.webkit.org/show_bug.cgi?id=80103
+
+        Broke WebSocket tests on Chrome Mac and Linux
+
+        * http/tests/websocket/tests/hybi/close-expected.txt:
+        * http/tests/websocket/tests/hybi/unpaired-surrogates-in-close-reason-expected.txt: Removed.
+        * http/tests/websocket/tests/hybi/unpaired-surrogates-in-close-reason.html: Removed.
+        * http/tests/websocket/tests/hybi/unpaired-surrogates-in-message-expected.txt: Removed.
+        * http/tests/websocket/tests/hybi/unpaired-surrogates-in-message.html: Removed.
+        * http/tests/websocket/tests/hybi/workers/close-expected.txt:
+
 2012-03-06  Hans Wennborg  <hans@chromium.org>
 

trunk/LayoutTests/http/tests/websocket/tests/hybi/close-expected.txt

@@ -1 +1 @@
 CONSOLE MESSAGE: WebSocket is closed before the connection is established.
-CONSOLE MESSAGE: WebSocket close message is too long.
-CONSOLE MESSAGE: WebSocket close message is too long.
 CONSOLE MESSAGE: WebSocket is closed before the connection is established.
 Verify WebSocket::close behaviors.

trunk/LayoutTests/http/tests/websocket/tests/hybi/workers/close-expected.txt

@@ -1 +1 @@
 CONSOLE MESSAGE: WebSocket is closed before the connection is established.
-CONSOLE MESSAGE: WebSocket close message is too long.
-CONSOLE MESSAGE: WebSocket close message is too long.
 CONSOLE MESSAGE: WebSocket is closed before the connection is established.
 Verify WebSocket::close behaviors in Worker.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-06  Stephen White  <senorblanco@chromium.org>
+
+        Unreviewed, rolling out r109840.
+        http://trac.webkit.org/changeset/109840
+        https://bugs.webkit.org/show_bug.cgi?id=80103
+
+        Broke WebSocket tests on Chrome Mac and Linux
+
+        * Modules/websockets/WebSocket.cpp:
+        (WebCore::WebSocket::send):
+        (WebCore::WebSocket::close):
+        * Modules/websockets/WebSocketChannel.cpp:
+        (WebCore::WebSocketChannel::send):
+
 2012-03-05  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/Modules/websockets/WebSocket.cpp

@@ -289 +289 @@
         return false;
     }
+    // FIXME: check message is valid utf8.
     ASSERT(m_channel);
-    ThreadableWebSocketChannel::SendResult result = m_channel->send(message);
-    if (result == ThreadableWebSocketChannel::InvalidMessage) {
-        scriptExecutionContext()->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "Websocket message contains invalid character(s).");
-        ec = SYNTAX_ERR;
-        return false;
-    }
-    return result == ThreadableWebSocketChannel::SendSuccess;
+    return m_channel->send(message) == ThreadableWebSocketChannel::SendSuccess;
 }
 
@@ -349 +344 @@
             return;
         }
-        CString utf8 = reason.utf8(true);
-        if (utf8.length() > maxReasonSizeInBytes) {
-            scriptExecutionContext()->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "WebSocket close message is too long.");
-            ec = SYNTAX_ERR;
-            return;
-        }
-        // Checks whether reason is valid utf8.
-        if (utf8.isNull() && reason.length()) {
-            scriptExecutionContext()->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "WebSocket close message contains invalid character(s).");
+        // FIXME: if reason contains any unpaired surrogates, raise SYNTAX_ERR.
+        if (reason.utf8().length() > maxReasonSizeInBytes) {
             ec = SYNTAX_ERR;
             return;

trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp

@@ -161 +161 @@
 {
     LOG(Network, "WebSocketChannel %p send %s", this, message.utf8().data());
-    CString utf8 = message.utf8(true);
-    if (utf8.isNull() && message.length())
-        return InvalidMessage;
+    CString utf8 = message.utf8();
     if (m_useHixie76Protocol) {
         return sendFrameHixie76(utf8.data(), utf8.length()) ? ThreadableWebSocketChannel::SendSuccess : ThreadableWebSocketChannel::SendFail;