Changeset 267695 in webkit

Timestamp:

Sep 28, 2020, 1:18:22 AM (6 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.30/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/soup/WebSocketTaskSoup.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.30/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.30/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp

@@ -81 +81 @@
         }, 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);
 }