<!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>[175053] 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/175053">175053</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-22 10:16:44 -0700 (Wed, 22 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>XMLHttpRequest should support attribute responseURL as per latest XHR spec.
https://bugs.webkit.org/show_bug.cgi?id=136938
Patch by Shivakumar JM <shiva.jm@samsung.com> on 2014-10-22
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Tests: http/tests/xmlhttprequest/basic-auth-responseURL.html
http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html
http/tests/xmlhttprequest/redirect-credentials-responseURL.html
http/tests/xmlhttprequest/xmlhttprequest-responseURL.html
XMLHttpRequest should support attribute responseURL
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::responseURL):
* xml/XMLHttpRequest.h:
* xml/XMLHttpRequest.idl:
LayoutTests:
Added test to check responseURL attribute in XMLHttpRequest.
* http/tests/xmlhttprequest/basic-auth-responseURL-expected.txt: Added.
* http/tests/xmlhttprequest/basic-auth-responseURL.html: Added.
* http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt: Added.
* http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html: Added.
* http/tests/xmlhttprequest/redirect-credentials-responseURL-expected.txt: Added.
* http/tests/xmlhttprequest/redirect-credentials-responseURL.html: Added.
* http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt: Added.
* http/tests/xmlhttprequest/xmlhttprequest-responseURL.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequesth">trunk/Source/WebCore/xml/XMLHttpRequest.h</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestidl">trunk/Source/WebCore/xml/XMLHttpRequest.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestbasicauthresponseURLexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/basic-auth-responseURL-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestbasicauthresponseURLhtml">trunk/LayoutTests/http/tests/xmlhttprequest/basic-auth-responseURL.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestcrossoriginredirectresponseURLexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestcrossoriginredirectresponseURLhtml">trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestredirectcredentialsresponseURLexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/redirect-credentials-responseURL-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestredirectcredentialsresponseURLhtml">trunk/LayoutTests/http/tests/xmlhttprequest/redirect-credentials-responseURL.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestresponseURLexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestresponseURLhtml">trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175052 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-10-22 16:56:36 UTC (rev 175052)
+++ trunk/LayoutTests/ChangeLog 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-10-22 Shivakumar JM <shiva.jm@samsung.com>
+
+ XMLHttpRequest should support attribute responseURL as per latest XHR spec.
+ https://bugs.webkit.org/show_bug.cgi?id=136938
+
+ Reviewed by Alexey Proskuryakov.
+
+ Added test to check responseURL attribute in XMLHttpRequest.
+
+ * http/tests/xmlhttprequest/basic-auth-responseURL-expected.txt: Added.
+ * http/tests/xmlhttprequest/basic-auth-responseURL.html: Added.
+ * http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt: Added.
+ * http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html: Added.
+ * http/tests/xmlhttprequest/redirect-credentials-responseURL-expected.txt: Added.
+ * http/tests/xmlhttprequest/redirect-credentials-responseURL.html: Added.
+ * http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt: Added.
+ * http/tests/xmlhttprequest/xmlhttprequest-responseURL.html: Added.
+
</ins><span class="cx"> 2014-10-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Do not use CachedResourceLoader, SecurityOrigin, ResourceBuffer and other WebCore types
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestbasicauthresponseURLexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/basic-auth-responseURL-expected.txt (0 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/basic-auth-responseURL-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/basic-auth-responseURL-expected.txt 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Test XMLHttpRequest responseURL.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+req.readyState = 0: responseURL =
+PASS req.responseURL is ""
+req.readyState = 1: responseURL =
+PASS req.responseURL is ""
+req.readyState = 1: responseURL =
+PASS req.responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth/basic-auth.php?uid=async
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth/basic-auth.php?uid=async
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth/basic-auth.php?uid=async
+PASS req.responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth/basic-auth.php?uid=async"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestbasicauthresponseURLhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/basic-auth-responseURL.html (0 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/basic-auth-responseURL.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/basic-auth-responseURL.html 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<html>
+<body>
+<script src="/js-test-resources/js-test.js"></script>
+<div id="description"></div>
+<div id="console"></div>
+<script type="text/javascript">
+description("Test XMLHttpRequest responseURL.");
+window.jsTestIsAsync = true;
+
+//async
+req = new XMLHttpRequest;
+debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+shouldBeEqualToString('req.responseURL', '');
+req.open("GET", "resources/basic-auth/basic-auth.php?uid=async", true, "async", "123");
+debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+shouldBeEqualToString('req.responseURL', '');
+req.onreadystatechange = processStateChange;
+req.send("");
+debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+shouldBeEqualToString('req.responseURL', '');
+
+function processStateChange() {
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+
+ if (req.readyState == 4) {
+ shouldBeEqualToString('req.responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth/basic-auth.php?uid=async');
+ finishJSTest();
+ }
+}
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestcrossoriginredirectresponseURLexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt (0 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL-expected.txt 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+Test XMLHttpRequest responseURL.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi"
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/"
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/"
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect-cors.php
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/redirect-cors.php
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/redirect-cors.php"
+req.readyState = 1: responseURL =
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestcrossoriginredirectresponseURLhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html (0 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<html>
+<head></head>
+<body>
+<script src="/js-test-resources/js-test.js"></script>
+<script>
+
+description('Test XMLHttpRequest responseURL.');
+
+window.jsTestIsAsync = true;
+
+function runTest(url, type) {
+ return new Promise(function(resolve, reject) {
+ var req = new XMLHttpRequest();
+ window.responseURL = req.responseURL;
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ shouldBeEqualToString('responseURL', '');
+
+ req.open('GET', url);
+ req.responseType = type;
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', '');
+
+ req.onreadystatechange = function() {
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ if (req.readyState == req.DONE)
+ resolve(req);
+ }
+
+ req.send();
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', '');
+ });
+}
+
+runTest('resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi', 'text').then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi');
+
+ return runTest('resources/redirect.php?url=http://localhost:7/', 'document');
+}).then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:7/');
+
+ return runTest('resources/redirect.php?url=http://localhost:22/', 'text');
+}).then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/redirect.php?url=http://localhost:22/');
+
+ return runTest('resources/redirect-cors.php', 'text');
+}).then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/redirect-cors.php');
+
+ req.open('GET', 'http://127.0.0.1:8000/xmlhttprequest/resources/not-found.txt');
+}).catch(function(reason) {
+ testFailed(String(reason));
+}).then(finishJSTest, finishJSTest);
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestredirectcredentialsresponseURLexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/redirect-credentials-responseURL-expected.txt (0 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/redirect-credentials-responseURL-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/redirect-credentials-responseURL-expected.txt 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+Test XMLHttpRequest responseURL.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir1/basic-auth.php
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir1/basic-auth.php
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir1/basic-auth.php
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir1/basic-auth.php"
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir2/basic-auth.php
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir2/basic-auth.php
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir2/basic-auth.php
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir2/basic-auth.php"
+req.readyState = 1: responseURL =
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestredirectcredentialsresponseURLhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/redirect-credentials-responseURL.html (0 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/redirect-credentials-responseURL.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/redirect-credentials-responseURL.html 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+<html>
+<head></head>
+<body>
+<script src="/js-test-resources/js-test.js"></script>
+<script>
+
+description('Test XMLHttpRequest responseURL.');
+
+window.jsTestIsAsync = true;
+
+function runTest(url, type, async, user, pwd) {
+ return new Promise(function(resolve, reject) {
+ var req = new XMLHttpRequest();
+ window.responseURL = req.responseURL;
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ shouldBeEqualToString('responseURL', '');
+
+ req.open('GET', url, async, user, pwd);
+ req.responseType = type;
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', '');
+
+ req.onreadystatechange = function() {
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ if (req.readyState == req.DONE)
+ resolve(req);
+ }
+
+ req.send();
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', '');
+ });
+}
+
+runTest('resources/basic-auth-default/dir1/basic-auth.php', true, "test", "test", 'text').then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir1/basic-auth.php');
+
+ return runTest('resources/basic-auth-default/dir2/basic-auth.php', true, 'text');
+}).then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/basic-auth-default/dir2/basic-auth.php');
+
+ req.open('GET', 'http://127.0.0.1:8000/xmlhttprequest/resources/not-found.txt');
+}).catch(function(reason) {
+ testFailed(String(reason));
+}).then(finishJSTest, finishJSTest);
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestresponseURLexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt (0 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+Test XMLHttpRequest responseURL.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/reply.txt
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/reply.txt
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/reply.txt
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/reply.txt"
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/reply.xml
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/reply.xml
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/reply.xml
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/reply.xml"
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/not-found.txt
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/not-found.txt
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/not-found.txt
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/not-found.txt"
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/cross-site-progress-events.cgi
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/cross-site-progress-events.cgi
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/cross-site-progress-events.cgi
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/cross-site-progress-events.cgi"
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/"
+req.readyState = 0: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 1: responseURL =
+PASS responseURL is ""
+req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo
+req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo
+req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo
+PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo"
+req.readyState = 1: responseURL =
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestresponseURLhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL.html (0 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL.html 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+<html>
+<head></head>
+<body>
+<script src="/js-test-resources/js-test.js"></script>
+<script>
+
+description('Test XMLHttpRequest responseURL.');
+
+window.jsTestIsAsync = true;
+
+function runTest(url, type) {
+ return new Promise(function(resolve, reject) {
+ var req = new XMLHttpRequest();
+ window.responseURL = req.responseURL;
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ shouldBeEqualToString('responseURL', '');
+
+ req.open('GET', url);
+ req.responseType = type;
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', '');
+
+ req.onreadystatechange = function() {
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ if (req.readyState == req.DONE)
+ resolve(req);
+ }
+
+ req.send();
+ debug('req.readyState = ' + req.readyState + ': responseURL = ' + req.responseURL);
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', '');
+ });
+}
+
+runTest('resources/reply.txt', 'text').then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/reply.txt');
+
+ return runTest('resources/redirect_methods.php?url=reply.xml', 'document');
+}).then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/reply.xml');
+
+ return runTest('resources/redirect_methods.php?url=not-found.txt', 'text');
+}).then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/not-found.txt');
+
+ return runTest('resources/cross-site-progress-events.cgi', 'text');
+}).then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/cross-site-progress-events.cgi');
+
+ return runTest('resources/network-simulator.php?command=connect/', 'text');
+}).then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/');
+
+ return runTest("resources/supported-xml-content-types.cgi?type=foo#bar/baz+xml", 'xml');
+}).then(function(req) {
+ window.responseURL = req.responseURL;
+ shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo');
+
+ req.open('GET', 'http://127.0.0.1:8000/xmlhttprequest/resources/not-found.txt');
+}).catch(function(reason) {
+ testFailed(String(reason));
+}).then(finishJSTest, finishJSTest);
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175052 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-22 16:56:36 UTC (rev 175052)
+++ trunk/Source/WebCore/ChangeLog 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-10-22 Shivakumar JM <shiva.jm@samsung.com>
+
+ XMLHttpRequest should support attribute responseURL as per latest XHR spec.
+ https://bugs.webkit.org/show_bug.cgi?id=136938
+
+ Reviewed by Alexey Proskuryakov.
+
+ Tests: http/tests/xmlhttprequest/basic-auth-responseURL.html
+ http/tests/xmlhttprequest/cross-origin-redirect-responseURL.html
+ http/tests/xmlhttprequest/redirect-credentials-responseURL.html
+ http/tests/xmlhttprequest/xmlhttprequest-responseURL.html
+
+ XMLHttpRequest should support attribute responseURL
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::responseURL):
+ * xml/XMLHttpRequest.h:
+ * xml/XMLHttpRequest.idl:
+
</ins><span class="cx"> 2014-10-22 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add initial support for generating the StyleBuilder from CSSPropertyNames.in
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (175052 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-10-22 16:56:36 UTC (rev 175052)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -335,6 +335,14 @@
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String XMLHttpRequest::responseURL() const
+{
+ URL responseURL(m_response.url());
+ responseURL.removeFragmentIdentifier();
+
+ return responseURL.string();
+}
+
</ins><span class="cx"> void XMLHttpRequest::setLastSendLineAndColumnNumber(unsigned lineNumber, unsigned columnNumber)
</span><span class="cx"> {
</span><span class="cx"> m_lastSendLineNumber = lineNumber;
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.h (175052 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.h 2014-10-22 16:56:36 UTC (rev 175052)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.h 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -132,6 +132,8 @@
</span><span class="cx"> String responseType();
</span><span class="cx"> ResponseTypeCode responseTypeCode() const { return m_responseTypeCode; }
</span><span class="cx">
</span><ins>+ String responseURL() const;
+
</ins><span class="cx"> // response attribute has custom getter.
</span><span class="cx"> JSC::ArrayBuffer* responseArrayBuffer();
</span><span class="cx"> JSC::ArrayBuffer* optionalResponseArrayBuffer() const { return m_responseArrayBuffer.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.idl (175052 => 175053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.idl 2014-10-22 16:56:36 UTC (rev 175052)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.idl 2014-10-22 17:16:44 UTC (rev 175053)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx">
</span><span class="cx"> readonly attribute unsigned short status;
</span><span class="cx"> readonly attribute DOMString statusText;
</span><ins>+ readonly attribute DOMString responseURL;
</ins><span class="cx">
</span><span class="cx"> // Extension
</span><span class="cx"> [RaisesException] void overrideMimeType(DOMString override);
</span></span></pre>
</div>
</div>
</body>
</html>