<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[237584] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/237584">237584</a></dd>
<dt>Author</dt> <dd>csaavedra@igalia.com</dd>
<dt>Date</dt> <dd>2018-10-30 01:26:57 -0700 (Tue, 30 Oct 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK][WPE] Fixes to the PublicSuffix implementation
https://bugs.webkit.org/show_bug.cgi?id=191031

Reviewed by Michael Catanzaro.

Source/WebCore:

Covered by existing tests.

Downcase hostnames before passing it on to the underlying
libsoup API. Special case localhost and fix a mixed-up
libsoup GError checks. This fixes most of the failures.

* platform/soup/PublicSuffixSoup.cpp:
(WebCore::isPublicSuffix):
(WebCore::topPrivatelyControlledDomain):

Tools:

* TestWebKitAPI/Tests/WebCore/PublicSuffix.cpp:
(TestWebKitAPI::TEST_F): Remove a test for a domain
that is not registrable and shouldn't be tested there.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformsoupPublicSuffixSoupcpp">trunk/Source/WebCore/platform/soup/PublicSuffixSoup.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCorePublicSuffixcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/PublicSuffix.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (237583 => 237584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2018-10-30 05:52:40 UTC (rev 237583)
+++ trunk/Source/WebCore/ChangeLog      2018-10-30 08:26:57 UTC (rev 237584)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2018-10-30  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [GTK][WPE] Fixes to the PublicSuffix implementation
+        https://bugs.webkit.org/show_bug.cgi?id=191031
+
+        Reviewed by Michael Catanzaro.
+
+        Covered by existing tests.
+
+        Downcase hostnames before passing it on to the underlying
+        libsoup API. Special case localhost and fix a mixed-up
+        libsoup GError checks. This fixes most of the failures.
+
+        * platform/soup/PublicSuffixSoup.cpp:
+        (WebCore::isPublicSuffix):
+        (WebCore::topPrivatelyControlledDomain):
+
</ins><span class="cx"> 2018-10-29  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Missing from r237549
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsoupPublicSuffixSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/soup/PublicSuffixSoup.cpp (237583 => 237584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/soup/PublicSuffixSoup.cpp  2018-10-30 05:52:40 UTC (rev 237583)
+++ trunk/Source/WebCore/platform/soup/PublicSuffixSoup.cpp     2018-10-30 08:26:57 UTC (rev 237584)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">     if (domain.isEmpty())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    return soup_tld_domain_is_public_suffix(domain.utf8().data());
</del><ins>+    return soup_tld_domain_is_public_suffix(domain.convertToASCIILowercase().utf8().data());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> String topPrivatelyControlledDomain(const String& domain)
</span><span class="lines">@@ -46,15 +46,21 @@
</span><span class="cx">     if (domain.isEmpty())
</span><span class="cx">         return String();
</span><span class="cx"> 
</span><ins>+    String lowercaseDomain = domain.convertToASCIILowercase();
+
+    if (lowercaseDomain == "localhost")
+        return lowercaseDomain;
+
</ins><span class="cx">     GUniqueOutPtr<GError> error;
</span><del>-    CString domainUTF8 = domain.utf8();
</del><ins>+    CString domainUTF8 = lowercaseDomain.utf8();
+
</ins><span class="cx">     if (const char* baseDomain = soup_tld_get_base_domain(domainUTF8.data(), &error.outPtr()))
</span><span class="cx">         return String::fromUTF8(baseDomain);
</span><span class="cx"> 
</span><del>-    if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NO_BASE_DOMAIN) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NOT_ENOUGH_DOMAINS))
</del><ins>+    if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_INVALID_HOSTNAME) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NOT_ENOUGH_DOMAINS))
</ins><span class="cx">         return String();
</span><span class="cx"> 
</span><del>-    if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_IS_IP_ADDRESS) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_INVALID_HOSTNAME))
</del><ins>+    if (g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_IS_IP_ADDRESS) || g_error_matches(error.get(), SOUP_TLD_ERROR, SOUP_TLD_ERROR_NO_BASE_DOMAIN))
</ins><span class="cx">         return domain;
</span><span class="cx"> 
</span><span class="cx">     ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (237583 => 237584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2018-10-30 05:52:40 UTC (rev 237583)
+++ trunk/Tools/ChangeLog       2018-10-30 08:26:57 UTC (rev 237584)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2018-10-30  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [GTK][WPE] Fixes to the PublicSuffix implementation
+        https://bugs.webkit.org/show_bug.cgi?id=191031
+
+        Reviewed by Michael Catanzaro.
+
+        * TestWebKitAPI/Tests/WebCore/PublicSuffix.cpp:
+        (TestWebKitAPI::TEST_F): Remove a test for a domain
+        that is not registrable and shouldn't be tested there.
+
</ins><span class="cx"> 2018-10-29  Tim Horton  <timothy_horton@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Modernize WebKit nibs and lprojs for localization's sake
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCorePublicSuffixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/PublicSuffix.cpp (237583 => 237584)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/PublicSuffix.cpp 2018-10-30 05:52:40 UTC (rev 237583)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/PublicSuffix.cpp    2018-10-30 08:26:57 UTC (rev 237584)
</span><span class="lines">@@ -153,7 +153,6 @@
</span><span class="cx"> 
</span><span class="cx"> TEST_F(PublicSuffix, TopPrivatelyControlledDomain)
</span><span class="cx"> {
</span><del>-    EXPECT_EQ(utf16String(u"\u6803\u6728.jp"), topPrivatelyControlledDomain(utf16String(u"\u6803\u6728.jp")));
</del><span class="cx">     EXPECT_EQ(String(utf16String(u"example.\u6803\u6728.jp")), topPrivatelyControlledDomain(utf16String(u"example.\u6803\u6728.jp")));
</span><span class="cx">     EXPECT_EQ(String(), topPrivatelyControlledDomain(String()));
</span><span class="cx">     EXPECT_EQ(String(), topPrivatelyControlledDomain(""));
</span></span></pre>
</div>
</div>

</body>
</html>