<!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>[168504] 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/168504">168504</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-08 16:38:18 -0700 (Thu, 08 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/168498">r168498</a>.
https://bugs.webkit.org/show_bug.cgi?id=132714

broke Mavericks WK2 (Requested by litherum on #webkit).

Reverted changeset:

&quot;http/tests/security/xss-DENIED-xsl-document-redirect.xml
fails with NetworkProcess&quot;
https://bugs.webkit.org/show_bug.cgi?id=132523
http://trac.webkit.org/changeset/168498</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastxmlhttprequestxmlhttprequestnonexistentfileexpectedtxt">trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkSourceWebCorexmlXSLTProcessorLibxsltcpp">trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168503 => 168504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-05-08 23:25:42 UTC (rev 168503)
+++ trunk/LayoutTests/ChangeLog        2014-05-08 23:38:18 UTC (rev 168504)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-08  Commit Queue  &lt;commit-queue@webkit.org&gt;
+
+        Unreviewed, rolling out r168498.
+        https://bugs.webkit.org/show_bug.cgi?id=132714
+
+        broke Mavericks WK2 (Requested by litherum on #webkit).
+
+        Reverted changeset:
+
+        &quot;http/tests/security/xss-DENIED-xsl-document-redirect.xml
+        fails with NetworkProcess&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=132523
+        http://trac.webkit.org/changeset/168498
+
</ins><span class="cx"> 2014-05-08  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         http/tests/security/xss-DENIED-xsl-document-redirect.xml fails with NetworkProcess
</span></span></pre></div>
<a id="trunkLayoutTestsfastxmlhttprequestxmlhttprequestnonexistentfileexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt (168503 => 168504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt        2014-05-08 23:25:42 UTC (rev 168503)
+++ trunk/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt        2014-05-08 23:38:18 UTC (rev 168504)
</span><span class="lines">@@ -11,5 +11,4 @@
</span><span class="cx"> Doing an XHR to a directory.
</span><span class="cx"> ReadyState handler: readyState = 1
</span><span class="cx"> ReadyState handler: readyState = 4
</span><del>-Error handler: readyState = 4
</del><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (168503 => 168504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations        2014-05-08 23:25:42 UTC (rev 168503)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations        2014-05-08 23:38:18 UTC (rev 168504)
</span><span class="lines">@@ -406,6 +406,9 @@
</span><span class="cx"> webkit.org/b/123431 [ Mavericks ] http/tests/local/link-stylesheet-load-order-preload.html [ Failure ]
</span><span class="cx"> webkit.org/b/123431 [ Mavericks ] http/tests/local/link-stylesheet-load-order.html [ Failure ]
</span><span class="cx"> 
</span><ins>+# passes but has different logging
+[ Mavericks ] http/tests/security/xss-DENIED-xsl-document-redirect.xml [ Failure ]
+
</ins><span class="cx"> # test results in DRT don't match in browser behavior, test seems broken
</span><span class="cx"> fast/dom/Window/mozilla-focus-blur.html [ Failure ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168503 => 168504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-05-08 23:25:42 UTC (rev 168503)
+++ trunk/Source/WebCore/ChangeLog        2014-05-08 23:38:18 UTC (rev 168504)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-08  Commit Queue  &lt;commit-queue@webkit.org&gt;
+
+        Unreviewed, rolling out r168498.
+        https://bugs.webkit.org/show_bug.cgi?id=132714
+
+        broke Mavericks WK2 (Requested by litherum on #webkit).
+
+        Reverted changeset:
+
+        &quot;http/tests/security/xss-DENIED-xsl-document-redirect.xml
+        fails with NetworkProcess&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=132523
+        http://trac.webkit.org/changeset/168498
+
</ins><span class="cx"> 2014-05-08  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         http/tests/security/xss-DENIED-xsl-document-redirect.xml fails with NetworkProcess
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (168503 => 168504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp        2014-05-08 23:25:42 UTC (rev 168503)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp        2014-05-08 23:38:18 UTC (rev 168504)
</span><span class="lines">@@ -508,6 +508,14 @@
</span><span class="cx"> 
</span><span class="cx">     if (error.isNull())
</span><span class="cx">         response = client-&gt;response();
</span><ins>+    else {
+        response = ResourceResponse(request.url(), String(), 0, String(), String());
+        // FIXME: ResourceHandleMac also handles authentication errors by setting code to 401. CFNet version should probably do the same.
+        if (error.domain() == String(kCFErrorDomainCFNetwork))
+            response.setHTTPStatusCode(error.errorCode());
+        else
+            response.setHTTPStatusCode(404);
+    }
</ins><span class="cx"> 
</span><span class="cx">     data.swap(client-&gt;mutableData());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (168503 => 168504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm        2014-05-08 23:25:42 UTC (rev 168503)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm        2014-05-08 23:38:18 UTC (rev 168504)
</span><span class="lines">@@ -414,6 +414,25 @@
</span><span class="cx"> 
</span><span class="cx">     if (error.isNull())
</span><span class="cx">         response = client-&gt;response();
</span><ins>+    else {
+        // FIXME: We might not ever need to manufacture a response: This might all be dead code.
+        // When exploring removal of this code, we should substitute appropriate ASSERTs.
+        response = ResourceResponse(request.url(), String(), 0, String(), String());
+        if (error.domain() == String(NSURLErrorDomain))
+            switch (error.errorCode()) {
+            case NSURLErrorUserCancelledAuthentication:
+                // FIXME: We don't need to manufacture a 401 response if we say continueWithoutCredentialForAuthenticationChallenge:
+                // in which case we'll get the real failure response. A reading of SynchronousLoaderClient.mm suggests we already do this.
+                response.setHTTPStatusCode(401);
+                break;
+            default:
+                response.setHTTPStatusCode(error.errorCode());
+            }
+        else {
+            // FIXME: This is wrong. We shouldn't need to ever make up a 404.
+            response.setHTTPStatusCode(404);
+        }
+     }
</ins><span class="cx"> 
</span><span class="cx">     data.swap(client-&gt;mutableData());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXSLTProcessorLibxsltcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp (168503 => 168504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp        2014-05-08 23:25:42 UTC (rev 168503)
+++ trunk/Source/WebCore/xml/XSLTProcessorLibxslt.cpp        2014-05-08 23:38:18 UTC (rev 168504)
</span><span class="lines">@@ -128,10 +128,7 @@
</span><span class="cx">         bool requestAllowed = globalCachedResourceLoader-&gt;frame() &amp;&amp; globalCachedResourceLoader-&gt;document()-&gt;securityOrigin()-&gt;canRequest(url);
</span><span class="cx">         if (requestAllowed) {
</span><span class="cx">             globalCachedResourceLoader-&gt;frame()-&gt;loader().loadResourceSynchronously(url, AllowStoredCredentials, DoNotAskClientForCrossOriginCredentials, error, response, data);
</span><del>-            if (error.isNull())
-                requestAllowed = globalCachedResourceLoader-&gt;document()-&gt;securityOrigin()-&gt;canRequest(response.url());
-            else
-                data.clear();
</del><ins>+            requestAllowed = globalCachedResourceLoader-&gt;document()-&gt;securityOrigin()-&gt;canRequest(response.url());
</ins><span class="cx">         }
</span><span class="cx">         if (!requestAllowed) {
</span><span class="cx">             data.clear();
</span></span></pre>
</div>
</div>

</body>
</html>