Attachment 409776 Details for Bug 217012 – Patch

[patch] Patch

soup-socket-cookies-inspector.diff (text/plain), 1.78 KB, created by Carlos Garcia Campos on 2020-09-26 07:35:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2020-09-26 07:35:20 PDT

Size: 1.78 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 87d897995927..30e86a7276bf 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2020-09-26  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 NOBODY (OOPS!).
>+
>+        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>
> 
>         [SOUP] Do not set site for cookies twice in case of redirection
>diff --git a/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp
>index 3f175067def8..1ea0101e8aaa 100644
>--- a/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/soup/WebSocketTaskSoup.cpp
>@@ -80,9 +80,11 @@ WebSocketTask::WebSocketTask(NetworkSocketChannel& channel, SoupSession* session
>                 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()

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 217012: 409776