Changeset 173642 in webkit

Timestamp:

Sep 15, 2014 5:45:04 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Web Core: Websocket state should be set to closed in didReceiveMessage call back.
​https://bugs.webkit.org/show_bug.cgi?id=136219

Patch by Shivakumar JM <​shiva.jm@samsung.com> on 2014-09-15
Reviewed by Alexey Proskuryakov.

Source/WebCore:

Set the Websocket state to closed in didReceiveMessage call back.

Test: http/tests/websocket/tests/hybi/error-event-ready-state.html

• Modules/websockets/WebSocket.cpp:

(WebCore::WebSocket::didReceiveMessageError):

LayoutTests:

Added test to check readyState is CLOSED within onerror event.

• http/tests/websocket/tests/hybi/error-event-ready-state-expected.txt: Added.
• http/tests/websocket/tests/hybi/error-event-ready-state.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state-expected.txt (added)
• LayoutTests/http/tests/websocket/tests/hybi/error-event-ready-state.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/websockets/WebSocket.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-09-15  Shivakumar JM  <shiva.jm@samsung.com>
+
+        Web Core: Websocket state should be set to closed in didReceiveMessage call back.
+        https://bugs.webkit.org/show_bug.cgi?id=136219
+
+        Reviewed by Alexey Proskuryakov.
+
+        Added test to check readyState is CLOSED within onerror event.
+
+        * http/tests/websocket/tests/hybi/error-event-ready-state-expected.txt: Added.
+        * http/tests/websocket/tests/hybi/error-event-ready-state.html: Added.
+
 2014-09-15  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-15  Shivakumar JM  <shiva.jm@samsung.com>
+
+        Web Core: Websocket state should be set to closed in didReceiveMessage call back.
+        https://bugs.webkit.org/show_bug.cgi?id=136219
+
+        Reviewed by Alexey Proskuryakov.
+
+        Set the Websocket state to closed in didReceiveMessage call back.
+
+        Test: http/tests/websocket/tests/hybi/error-event-ready-state.html
+
+        * Modules/websockets/WebSocket.cpp:
+        (WebCore::WebSocket::didReceiveMessageError):
+
 2014-09-15  Jon Honeycutt  <jhoneycutt@apple.com>
 

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

@@ -534 +534 @@
 {
     LOG(Network, "WebSocket %p didReceiveErrorMessage()", this);
+    m_state = CLOSED;
     ASSERT(scriptExecutionContext());
     dispatchEvent(Event::create(eventNames().errorEvent, false, false));