Attachment 358702 Details for Bug 193282 – Patch

[patch] Patch

bug-193282-20190109103836.patch (text/plain), 2.86 KB, created by Patrick Griffis on 2019-01-09 07:38:37 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Griffis

Created: 2019-01-09 07:38:37 PST

Size: 2.86 KB

patch

obsolete

>Subversion Revision: 239769
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d1d06c556eec5c88e2727c195ce2ce8b0d2dd13d..c135aa082e5233b19a4f9ce5a21b19aaea4181e1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-01-09  Patrick Griffis  <pgriffis@igalia.com>
>+
>+        [GTK][WPE] Remove incorrect libsoup assumption
>+        https://bugs.webkit.org/show_bug.cgi?id=193282
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        libsoup has never returned secure cookies for http uris in at least 11 years.
>+
>+        https://gitlab.gnome.org/GNOME/libsoup/blob/00b248affb679c2103fc55d1f3656346d1db2002/libsoup/soup-cookie.c#L1018-1019
>+
>+        * platform/network/soup/NetworkStorageSessionSoup.cpp:
>+        (WebCore::cookiesForSession):
>+
> 2019-01-09  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         REGRESSION(r239156): [FreeType] fixed width, and synthetic bold/italic not correctly applied since r239156
>diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>index adbc45d6430497798162e76e739f49264f1c7ed4..615ac132b8185e8ef1a1ec3c843e2870cf04c1c9 100644
>--- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>@@ -535,23 +535,20 @@ static std::pair<String, bool> cookiesForSession(const NetworkStorageSession& se
>     GSList* cookies = soup_cookie_jar_get_cookie_list(session.cookieStorage(), uri.get(), forHTTPHeader);
>     bool didAccessSecureCookies = false;
> 
>-    // libsoup should omit secure cookies itself if the protocol is not https.
>-    if (url.protocolIs("https")) {
>-        GSList* item = cookies;
>-        while (item) {
>-            auto cookie = static_cast<SoupCookie*>(item->data);
>-            if (soup_cookie_get_secure(cookie)) {
>-                didAccessSecureCookies = true;
>-                if (includeSecureCookies == IncludeSecureCookies::No) {
>-                    GSList* next = item->next;
>-                    soup_cookie_free(static_cast<SoupCookie*>(item->data));
>-                    cookies = g_slist_remove_link(cookies, item);
>-                    item = next;
>-                    continue;
>-                }
>+    GSList* item = cookies;
>+    while (item) {
>+        auto cookie = static_cast<SoupCookie*>(item->data);
>+        if (soup_cookie_get_secure(cookie)) {
>+            didAccessSecureCookies = true;
>+            if (includeSecureCookies == IncludeSecureCookies::No) {
>+                GSList* next = item->next;
>+                soup_cookie_free(static_cast<SoupCookie*>(item->data));
>+                cookies = g_slist_remove_link(cookies, item);
>+                item = next;
>+                continue;
>             }
>-            item = item->next;
>         }
>+        item = item->next;
>     }
> 
>     if (!cookies)

Actions: View | Formatted Diff | Diff

Attachments on bug 193282: 358702