<!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>[210365] 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/210365">210365</a></dd>
<dt>Author</dt> <dd>krollin@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 11:18:03 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WebCore::URL::protocolHostAndPort
https://bugs.webkit.org/show_bug.cgi?id=166426
Reviewed by Alex Christensen.
Source/WebCore:
Added to support record/replay mechanism, which needs it in order to
implement fuzzy-matching of URLs that are similar to each other but
that nonetheless come from the same source/host.
Updated TestWebKitAPI/Tests/WebCore/URL.cpp.
* platform/URL.cpp:
(WebCore::URL::protocolHostAndPort):
* platform/URL.h:
Tools:
Add test for protocolHostAndPort.
* TestWebKitAPI/Tests/WebCore/URL.cpp:
(TestWebKitAPI::TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformURLcpp">trunk/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformURLh">trunk/Source/WebCore/platform/URL.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreURLcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/URL.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210364 => 210365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-05 19:10:23 UTC (rev 210364)
+++ trunk/Source/WebCore/ChangeLog 2017-01-05 19:18:03 UTC (rev 210365)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-01-05 Keith Rollin <krollin@apple.com>
+
+ Add WebCore::URL::protocolHostAndPort
+ https://bugs.webkit.org/show_bug.cgi?id=166426
+
+ Reviewed by Alex Christensen.
+
+ Added to support record/replay mechanism, which needs it in order to
+ implement fuzzy-matching of URLs that are similar to each other but
+ that nonetheless come from the same source/host.
+
+ Updated TestWebKitAPI/Tests/WebCore/URL.cpp.
+
+ * platform/URL.cpp:
+ (WebCore::URL::protocolHostAndPort):
+ * platform/URL.h:
+
</ins><span class="cx"> 2017-01-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Form validation: Align email validation with the latest HTML specification
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.cpp (210364 => 210365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.cpp 2017-01-05 19:10:23 UTC (rev 210364)
+++ trunk/Source/WebCore/platform/URL.cpp 2017-01-05 19:18:03 UTC (rev 210365)
</span><span class="lines">@@ -717,6 +717,18 @@
</span><span class="cx"> return host();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String URL::protocolHostAndPort() const
+{
+ String result = m_string.substring(0, m_portEnd);
+
+ if (m_passwordEnd - m_userStart > 0) {
+ const int allowForTrailingAtSign = 1;
+ result.remove(m_userStart, m_passwordEnd - m_userStart + allowForTrailingAtSign);
+ }
+
+ return result;
+}
+
</ins><span class="cx"> String URL::user() const
</span><span class="cx"> {
</span><span class="cx"> return decodeURLEscapeSequences(m_string.substring(m_userStart, m_userEnd - m_userStart));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/URL.h (210364 => 210365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/URL.h 2017-01-05 19:10:23 UTC (rev 210364)
+++ trunk/Source/WebCore/platform/URL.h 2017-01-05 19:18:03 UTC (rev 210365)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> WEBCORE_EXPORT String host() const;
</span><span class="cx"> WEBCORE_EXPORT std::optional<uint16_t> port() const;
</span><span class="cx"> WEBCORE_EXPORT String hostAndPort() const;
</span><ins>+ WEBCORE_EXPORT String protocolHostAndPort() const;
</ins><span class="cx"> WEBCORE_EXPORT String user() const;
</span><span class="cx"> WEBCORE_EXPORT String pass() const;
</span><span class="cx"> WEBCORE_EXPORT String path() const;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210364 => 210365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-05 19:10:23 UTC (rev 210364)
+++ trunk/Tools/ChangeLog 2017-01-05 19:18:03 UTC (rev 210365)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-05 Keith Rollin <krollin@apple.com>
+
+ Add WebCore::URL::protocolHostAndPort
+ https://bugs.webkit.org/show_bug.cgi?id=166426
+
+ Reviewed by Alex Christensen.
+
+ Add test for protocolHostAndPort.
+
+ * TestWebKitAPI/Tests/WebCore/URL.cpp:
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2017-01-05 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Archive test result is failing.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URL.cpp (210364 => 210365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URL.cpp 2017-01-05 19:10:23 UTC (rev 210364)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URL.cpp 2017-01-05 19:18:03 UTC (rev 210365)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WTFStringUtilities.h"
</span><span class="cx"> #include <WebCore/URL.h>
</span><ins>+#include <WebCore/URLParser.h>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -70,6 +71,53 @@
</span><span class="cx"> EXPECT_EQ(String("fragment"), kurl.fragmentIdentifier());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST_F(URLTest, URLProtocolHostAndPort)
+{
+ auto createURL = [](const char* urlAsString) {
+ URLParser parser(urlAsString);
+ return parser.result();
+ };
+
+ auto url = createURL("http://username:password@www.example.com:8080/index.html?var=val#fragment");
+ EXPECT_EQ(String("http://www.example.com:8080"), url.protocolHostAndPort());
+
+ url = createURL("http://username:@www.example.com:8080/index.html?var=val#fragment");
+ EXPECT_EQ(String("http://www.example.com:8080"), url.protocolHostAndPort());
+
+ url = createURL("http://:password@www.example.com:8080/index.html?var=val#fragment");
+ EXPECT_EQ(String("http://www.example.com:8080"), url.protocolHostAndPort());
+
+ url = createURL("http://username@www.example.com:8080/index.html?var=val#fragment");
+ EXPECT_EQ(String("http://www.example.com:8080"), url.protocolHostAndPort());
+
+ url = createURL("http://www.example.com:8080/index.html?var=val#fragment");
+ EXPECT_EQ(String("http://www.example.com:8080"), url.protocolHostAndPort());
+
+ url = createURL("http://www.example.com:/index.html?var=val#fragment");
+ EXPECT_EQ(String("http://www.example.com"), url.protocolHostAndPort());
+
+ url = createURL("http://www.example.com/index.html?var=val#fragment");
+ EXPECT_EQ(String("http://www.example.com"), url.protocolHostAndPort());
+
+ url = createURL("file:///a/b/c");
+ EXPECT_EQ(String("file://"), url.protocolHostAndPort());
+
+ url = createURL("file:///a/b");
+ EXPECT_EQ(String("file://"), url.protocolHostAndPort());
+
+ url = createURL("file:///a");
+ EXPECT_EQ(String("file://"), url.protocolHostAndPort());
+
+ url = createURL("file:///a");
+ EXPECT_EQ(String("file://"), url.protocolHostAndPort());
+
+ url = createURL("asdf://username:password@www.example.com:8080/index.html?var=val#fragment");
+ EXPECT_EQ(String("asdf://www.example.com:8080"), url.protocolHostAndPort());
+
+ url = createURL("asdf:///a/b/c");
+ EXPECT_EQ(String("asdf://"), url.protocolHostAndPort());
+}
+
</ins><span class="cx"> TEST_F(URLTest, URLDataURIStringSharing)
</span><span class="cx"> {
</span><span class="cx"> URL baseURL(ParsedURLString, "http://www.webkit.org/");
</span></span></pre>
</div>
</div>
</body>
</html>