Title: [248150] trunk
- Revision
- 248150
- Author
- [email protected]
- Date
- 2019-08-02 01:56:47 -0700 (Fri, 02 Aug 2019)
Log 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 <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (248149 => 248150)
--- trunk/LayoutTests/ChangeLog 2019-08-02 05:58:20 UTC (rev 248149)
+++ trunk/LayoutTests/ChangeLog 2019-08-02 08:56:47 UTC (rev 248150)
@@ -1,3 +1,15 @@
+2019-08-02 Carlos Garcia Campos <[email protected]>
+
+ [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 <[email protected]>
Pages using MessagePorts should be PageCacheable
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (248149 => 248150)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2019-08-02 05:58:20 UTC (rev 248149)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2019-08-02 08:56:47 UTC (rev 248150)
@@ -1179,8 +1179,6 @@
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 ]
-
#////////////////////////////////////////////////////////////////////////////////////////
# End of Expected failures.
#
Modified: trunk/LayoutTests/platform/wpe/TestExpectations (248149 => 248150)
--- trunk/LayoutTests/platform/wpe/TestExpectations 2019-08-02 05:58:20 UTC (rev 248149)
+++ trunk/LayoutTests/platform/wpe/TestExpectations 2019-08-02 08:56:47 UTC (rev 248150)
@@ -488,8 +488,6 @@
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 ]
-
#////////////////////////////////////////////////////////////////////////////////////////
# 3. UNRESOLVED TESTS
#////////////////////////////////////////////////////////////////////////////////////////
Modified: trunk/Source/WebKit/ChangeLog (248149 => 248150)
--- trunk/Source/WebKit/ChangeLog 2019-08-02 05:58:20 UTC (rev 248149)
+++ trunk/Source/WebKit/ChangeLog 2019-08-02 08:56:47 UTC (rev 248150)
@@ -1,3 +1,13 @@
+2019-08-02 Carlos Garcia Campos <[email protected]>
+
+ [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 <[email protected]>
Do not send NetworkProcessProxy::LogTestingEvent message if we are not testing
Modified: trunk/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp (248149 => 248150)
--- trunk/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp 2019-08-02 05:58:20 UTC (rev 248149)
+++ trunk/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp 2019-08-02 08:56:47 UTC (rev 248150)
@@ -29,6 +29,7 @@
#include "DataReference.h"
#include "NetworkSocketChannel.h"
#include <WebCore/HTTPParsers.h>
+#include <WebCore/WebSocketChannel.h>
#include <wtf/glib/GUniquePtr.h>
#include <wtf/text/StringBuilder.h>
@@ -193,6 +194,11 @@
return;
}
+#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());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
