Changeset 235078 in webkit

Timestamp:

Aug 20, 2018 7:08:47 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r235036 - Unreviewed. Fix GTK/WPE cookie API tests after r234396.

• UIProcess/WebsiteData/WebsiteDataRecord.cpp:

(WebKit::WebsiteDataRecord::displayNameForCookieHostName): Bring back the check to handle localhost as an
special case for non cocoa ports.

Location:

releases/WebKitGTK/webkit-2.22/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataRecord.cpp (modified) (1 diff)

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

@@ +1 @@
+2018-08-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix GTK/WPE cookie API tests after r234396.
+
+        * UIProcess/WebsiteData/WebsiteDataRecord.cpp:
+        (WebKit::WebsiteDataRecord::displayNameForCookieHostName): Bring back the check to handle localhost as an
+        special case for non cocoa ports.
+
 2018-08-17  Tim Horton  <timothy_horton@apple.com>
 

releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp

@@ -47 +47 @@
     if (hostName == String(kCFHTTPCookieLocalFileDomain))
         return displayNameForLocalFiles();
+#else
+    if (hostName == "localhost")
+        return hostName;
 #endif
     return displayNameForHostName(hostName);