<!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>[278894] 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/278894">278894</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2021-06-15 13:19:05 -0700 (Tue, 15 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Allow legacy SecurityOrigin behavior for x-apple-ql-id2 scheme
https://bugs.webkit.org/show_bug.cgi?id=226993
Source/WebCore:

<rdar://76474042>

Reviewed by Tim Horton.

Why have one x-apple-ql-id scheme when you can have 2?

* page/SecurityOrigin.cpp:
(WebCore::shouldTreatAsUniqueOrigin):
Also move the linked-on-or-before check to after the hasSpecialScheme check which will be true for most URLs (http, https, file, etc.)

Tools:


Reviewed by Tim Horton.

* TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp:
(TestWebKitAPI::TEST_F):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOrigincpp">trunk/Source/WebCore/page/SecurityOrigin.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreSecurityOrigincpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278893 => 278894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-15 20:12:47 UTC (rev 278893)
+++ trunk/Source/WebCore/ChangeLog      2021-06-15 20:19:05 UTC (rev 278894)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-06-15  Alex Christensen  <achristensen@webkit.org>
+
+        Allow legacy SecurityOrigin behavior for x-apple-ql-id2 scheme
+        https://bugs.webkit.org/show_bug.cgi?id=226993
+        <rdar://76474042>
+
+        Reviewed by Tim Horton.
+
+        Why have one x-apple-ql-id scheme when you can have 2?
+
+        * page/SecurityOrigin.cpp:
+        (WebCore::shouldTreatAsUniqueOrigin):
+        Also move the linked-on-or-before check to after the hasSpecialScheme check which will be true for most URLs (http, https, file, etc.)
+
</ins><span class="cx"> 2021-06-15  Philippe Normand  <pnormand@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GStreamer] Another crash under gst_element_add_pad
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (278893 => 278894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.cpp     2021-06-15 20:12:47 UTC (rev 278893)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp        2021-06-15 20:19:05 UTC (rev 278894)
</span><span class="lines">@@ -110,16 +110,13 @@
</span><span class="cx">     if (LegacySchemeRegistry::shouldTreatURLSchemeAsNoAccess(innerURL.protocol().toStringWithoutCopying()))
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><del>-#if PLATFORM(COCOA)
-    if (!linkedOnOrAfter(SDKVersion::FirstWithNullOriginForNonSpecialSchemedURLs))
-        return false;
-#endif
-
</del><span class="cx">     // https://url.spec.whatwg.org/#origin with some additions
</span><span class="cx">     if (url.hasSpecialScheme()
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+        || !linkedOnOrAfter(SDKVersion::FirstWithNullOriginForNonSpecialSchemedURLs)
</ins><span class="cx">         || url.protocolIs("applewebdata")
</span><span class="cx">         || url.protocolIs("x-apple-ql-id")
</span><ins>+        || url.protocolIs("x-apple-ql-id2")
</ins><span class="cx">         || url.protocolIs("x-apple-ql-magic")
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(WPE)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (278893 => 278894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-06-15 20:12:47 UTC (rev 278893)
+++ trunk/Tools/ChangeLog       2021-06-15 20:19:05 UTC (rev 278894)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-06-15  Alex Christensen  <achristensen@webkit.org>
+
+        Allow legacy SecurityOrigin behavior for x-apple-ql-id2 scheme
+        https://bugs.webkit.org/show_bug.cgi?id=226993
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp:
+        (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2021-06-15  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [git-webkit] Handle auth failures
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp (278893 => 278894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp       2021-06-15 20:12:47 UTC (rev 278893)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/SecurityOrigin.cpp  2021-06-15 20:19:05 UTC (rev 278894)
</span><span class="lines">@@ -88,6 +88,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     auto o9 = SecurityOrigin::createFromString("x-apple-ql-id://host");
</span><span class="cx">     auto o10 = SecurityOrigin::createFromString("x-apple-ql-magic://host");
</span><ins>+    auto o11 = SecurityOrigin::createFromString("x-apple-ql-id2://host");
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     EXPECT_EQ(String("http"), o1->protocol());
</span><span class="lines">@@ -101,6 +102,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     EXPECT_EQ(String("x-apple-ql-id"), o9->protocol());
</span><span class="cx">     EXPECT_EQ(String("x-apple-ql-magic"), o10->protocol());
</span><ins>+    EXPECT_EQ(String("x-apple-ql-id2"), o11->protocol());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     EXPECT_EQ(String("example.com"), o1->host());
</span><span class="lines">@@ -114,6 +116,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     EXPECT_EQ(String("host"), o9->host());
</span><span class="cx">     EXPECT_EQ(String("host"), o10->host());
</span><ins>+    EXPECT_EQ(String("host"), o11->host());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     EXPECT_FALSE(o1->port());
</span><span class="lines">@@ -127,6 +130,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     EXPECT_FALSE(o9->port());
</span><span class="cx">     EXPECT_FALSE(o10->port());
</span><ins>+    EXPECT_FALSE(o11->port());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     EXPECT_EQ("http://example.com", o1->toString());
</span><span class="lines">@@ -140,6 +144,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     EXPECT_EQ("x-apple-ql-id://host", o9->toString());
</span><span class="cx">     EXPECT_EQ("x-apple-ql-magic://host", o10->toString());
</span><ins>+    EXPECT_EQ("x-apple-ql-id2://host", o11->toString());
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     EXPECT_TRUE(o1->isSameOriginAs(o2.get()));
</span><span class="lines">@@ -152,6 +157,7 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     EXPECT_FALSE(o1->isSameOriginAs(o9.get()));
</span><span class="cx">     EXPECT_FALSE(o1->isSameOriginAs(o10.get()));
</span><ins>+    EXPECT_FALSE(o1->isSameOriginAs(o11.get()));
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>