Changeset 248150 in webkit

Timestamp:

Aug 2, 2019 1:56:47 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[SOUP] WebSockets: use SOUP_WEBSOCKET_CLOSE_NO_STATUS when closing with no status
​https://bugs.webkit.org/show_bug.cgi?id=200338

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2019-08-02
Reviewed by Alex Christensen.

Source/WebKit:

• NetworkProcess/soup/WebSocketTaskSoup.cpp:

(WebKit::WebSocketTask::close):

LayoutTests:

Remove failure expectation for http/tests/websocket/tests/hybi/client-close.html

• platform/gtk/TestExpectations:
• platform/wpe/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• LayoutTests/platform/wpe/TestExpectations (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] WebSockets: use SOUP_WEBSOCKET_CLOSE_NO_STATUS when closing with no status
+        https://bugs.webkit.org/show_bug.cgi?id=200338
+
+        Reviewed by Alex Christensen.
+
+        Remove failure expectation for http/tests/websocket/tests/hybi/client-close.html
+
+        * platform/gtk/TestExpectations:
+        * platform/wpe/TestExpectations:
+
 2019-08-01  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1180 +1180 @@
 webkit.org/b/200165 imported/w3c/web-platform-tests/websockets/cookies/007.html [ Failure ]
 
-webkit.org/b/200338 http/tests/websocket/tests/hybi/client-close.html [ Failure ]
-
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Expected failures.

trunk/LayoutTests/platform/wpe/TestExpectations

@@ -488 +488 @@
 webkit.org/b/200165 imported/w3c/web-platform-tests/websockets/cookies/002.html [ Failure ]
 webkit.org/b/200165 imported/w3c/web-platform-tests/websockets/cookies/007.html [ Failure ]
-
-webkit.org/b/200338 http/tests/websocket/tests/hybi/client-close.html [ Failure ]
 
 #////////////////////////////////////////////////////////////////////////////////////////

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-08-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [SOUP] WebSockets: use SOUP_WEBSOCKET_CLOSE_NO_STATUS when closing with no status
+        https://bugs.webkit.org/show_bug.cgi?id=200338
+
+        Reviewed by Alex Christensen.
+
+        * NetworkProcess/soup/WebSocketTaskSoup.cpp:
+        (WebKit::WebSocketTask::close):
+
 2019-08-01  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp

@@ -30 +30 @@
 #include "NetworkSocketChannel.h"
 #include <WebCore/HTTPParsers.h>
+#include <WebCore/WebSocketChannel.h>
 #include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/StringBuilder.h>
@@ -194 +195 @@
     }
 
+#if SOUP_CHECK_VERSION(2, 67, 90)
+    if (code == WebCore::WebSocketChannel::CloseEventCodeNotSpecified)
+        code = SOUP_WEBSOCKET_CLOSE_NO_STATUS;
+#endif
+
     if (soup_websocket_connection_get_state(m_connection.get()) == SOUP_WEBSOCKET_STATE_OPEN)
         soup_websocket_connection_close(m_connection.get(), code, reason.utf8().data());