Title: [267695] releases/WebKitGTK/webkit-2.30/Source/WebKit
Revision
267695
Author
[email protected]
Date
2020-09-28 01:18:22 -0700 (Mon, 28 Sep 2020)

Log Message

Merge r267655 - [SOUP] WebSocket: cookies set in request don't appear in the inspector
https://bugs.webkit.org/show_bug.cgi?id=217012

Reviewed by Michael Catanzaro.

Cookies are set by libsoup and we are notifying about the handshake being sent before the cookie header is added
to the request.

* NetworkProcess/soup/WebSocketTaskSoup.cpp:
(WebKit::WebSocketTask::WebSocketTask): Connect to SoupMessage::starting to notify the web process the handshake
request has been sent.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog (267694 => 267695)


--- releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog	2020-09-28 08:18:19 UTC (rev 267694)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog	2020-09-28 08:18:22 UTC (rev 267695)
@@ -1,3 +1,17 @@
+2020-09-27  Carlos Garcia Campos  <[email protected]>
+
+        [SOUP] WebSocket: cookies set in request don't appear in the inspector
+        https://bugs.webkit.org/show_bug.cgi?id=217012
+
+        Reviewed by Michael Catanzaro.
+
+        Cookies are set by libsoup and we are notifying about the handshake being sent before the cookie header is added
+        to the request.
+
+        * NetworkProcess/soup/WebSocketTaskSoup.cpp:
+        (WebKit::WebSocketTask::WebSocketTask): Connect to SoupMessage::starting to notify the web process the handshake
+        request has been sent.
+
 2020-09-26  Carlos Garcia Campos  <[email protected]>
 
         [SOUP] Do not set site for cookies twice in case of redirection

Modified: releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp (267694 => 267695)


--- releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp	2020-09-28 08:18:19 UTC (rev 267694)
+++ releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp	2020-09-28 08:18:22 UTC (rev 267695)
@@ -80,9 +80,11 @@
                 task->didFail(String::fromUTF8(error->message));
         }, this);
 
-    WebCore::ResourceRequest request;
-    request.updateFromSoupMessage(msg);
-    m_channel.didSendHandshakeRequest(WTFMove(request));
+    g_signal_connect(msg, "starting", G_CALLBACK(+[](SoupMessage* msg, WebSocketTask* task) {
+        WebCore::ResourceRequest request;
+        request.updateFromSoupMessage(msg);
+        task->m_channel.didSendHandshakeRequest(WTFMove(request));
+    }), this);
 }
 
 WebSocketTask::~WebSocketTask()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to