<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[24862] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24862">24862</a></dd>
<dt>Author</dt> <dd>andersca</dd>
<dt>Date</dt> <dd>2007-08-03 16:53:57 -0700 (Fri, 03 Aug 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Oliver.
<rdar://problem/5383286>
XMLHTTPRequest does not return 401 when user cancels authentication dialog (affects .Mac)
* loader/ResourceLoader.h:
Make receivedCancellation virtual.
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::receivedCancellation):
Call SubresourceLoaderClient::receivedCancellation.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::receivedCancellation):
Save the failure response.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreloaderResourceLoaderh">trunk/WebCore/loader/ResourceLoader.h</a></li>
<li><a href="#trunkWebCoreloaderSubresourceLoadercpp">trunk/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkWebCoreloaderSubresourceLoaderh">trunk/WebCore/loader/SubresourceLoader.h</a></li>
<li><a href="#trunkWebCoreloaderSubresourceLoaderClienth">trunk/WebCore/loader/SubresourceLoaderClient.h</a></li>
<li><a href="#trunkWebCorexmlXMLHttpRequestcpp">trunk/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkWebCorexmlXMLHttpRequesth">trunk/WebCore/xml/XMLHttpRequest.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (24861 => 24862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-08-03 23:07:22 UTC (rev 24861)
+++ trunk/WebCore/ChangeLog 2007-08-03 23:53:57 UTC (rev 24862)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2007-08-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Reviewed by Oliver.
+
+ <rdar://problem/5383286>
+ XMLHTTPRequest does not return 401 when user cancels authentication dialog (affects .Mac)
+
+ * loader/ResourceLoader.h:
+ Make receivedCancellation virtual.
+
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::receivedCancellation):
+ Call SubresourceLoaderClient::receivedCancellation.
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::receivedCancellation):
+ Save the failure response.
+
+2007-08-03 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Reviewed by Geoff.
</span><span class="cx">
</span><span class="cx"> <rdar://problem/5374393>
</span></span></pre></div>
<a id="trunkWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/ResourceLoader.h (24861 => 24862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/ResourceLoader.h 2007-08-03 23:07:22 UTC (rev 24861)
+++ trunk/WebCore/loader/ResourceLoader.h 2007-08-03 23:53:57 UTC (rev 24862)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
</span><span class="cx"> void didCancelAuthenticationChallenge(const AuthenticationChallenge&);
</span><del>- void receivedCancellation(const AuthenticationChallenge&);
</del><ins>+ virtual void receivedCancellation(const AuthenticationChallenge&);
</ins><span class="cx">
</span><span class="cx"> // ResourceHandleClient
</span><span class="cx"> virtual void willSendRequest(ResourceHandle*, ResourceRequest&, const ResourceResponse& redirectResponse);
</span></span></pre></div>
<a id="trunkWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/SubresourceLoader.cpp (24861 => 24862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/SubresourceLoader.cpp 2007-08-03 23:07:22 UTC (rev 24861)
+++ trunk/WebCore/loader/SubresourceLoader.cpp 2007-08-03 23:53:57 UTC (rev 24862)
</span><span class="lines">@@ -235,5 +235,18 @@
</span><span class="cx"> m_documentLoader->removeSubresourceLoader(this);
</span><span class="cx"> ResourceLoader::didCancel(error);
</span><span class="cx"> }
</span><ins>+
+void SubresourceLoader::receivedCancellation(const AuthenticationChallenge& challenge)
+{
+ ASSERT(!reachedTerminalState());
+
+ RefPtr<SubresourceLoader> protect(this);
+
+ if (m_client)
+ m_client->receivedCancellation(this, challenge);
</ins><span class="cx">
</span><ins>+ ResourceLoader::receivedCancellation(challenge);
</ins><span class="cx"> }
</span><ins>+
+
+}
</ins></span></pre></div>
<a id="trunkWebCoreloaderSubresourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/SubresourceLoader.h (24861 => 24862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/SubresourceLoader.h 2007-08-03 23:07:22 UTC (rev 24861)
+++ trunk/WebCore/loader/SubresourceLoader.h 2007-08-03 23:53:57 UTC (rev 24862)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> virtual void didReceiveData(const char*, int, long long lengthReceived, bool allAtOnce);
</span><span class="cx"> virtual void didFinishLoading();
</span><span class="cx"> virtual void didFail(const ResourceError&);
</span><ins>+ virtual void receivedCancellation(const AuthenticationChallenge&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SubresourceLoader(Frame*, SubresourceLoaderClient*, bool sendResourceLoadCallbacks);
</span></span></pre></div>
<a id="trunkWebCoreloaderSubresourceLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/SubresourceLoaderClient.h (24861 => 24862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/SubresourceLoaderClient.h 2007-08-03 23:07:22 UTC (rev 24861)
+++ trunk/WebCore/loader/SubresourceLoaderClient.h 2007-08-03 23:53:57 UTC (rev 24862)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class AuthenticationChallenge;
</ins><span class="cx"> class ResourceError;
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> class ResourceResponse;
</span><span class="lines">@@ -47,6 +48,9 @@
</span><span class="cx"> virtual void didReceiveData(SubresourceLoader*, const char*, int) { }
</span><span class="cx"> virtual void didFinishLoading(SubresourceLoader*) { }
</span><span class="cx"> virtual void didFail(SubresourceLoader*, const ResourceError&) { }
</span><ins>+
+ virtual void receivedCancellation(SubresourceLoader*, const AuthenticationChallenge&) { }
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/xml/XMLHttpRequest.cpp (24861 => 24862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/xml/XMLHttpRequest.cpp 2007-08-03 23:07:22 UTC (rev 24861)
+++ trunk/WebCore/xml/XMLHttpRequest.cpp 2007-08-03 23:53:57 UTC (rev 24862)
</span><span class="lines">@@ -679,6 +679,11 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void XMLHttpRequest::receivedCancellation(SubresourceLoader*, const AuthenticationChallenge& challenge)
+{
+ m_response = challenge.failureResponse();
+}
+
</ins><span class="cx"> void XMLHttpRequest::didReceiveData(SubresourceLoader*, const char* data, int len)
</span><span class="cx"> {
</span><span class="cx"> if (m_state < Sent)
</span></span></pre></div>
<a id="trunkWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/xml/XMLHttpRequest.h (24861 => 24862)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/xml/XMLHttpRequest.h 2007-08-03 23:07:22 UTC (rev 24861)
+++ trunk/WebCore/xml/XMLHttpRequest.h 2007-08-03 23:53:57 UTC (rev 24862)
</span><span class="lines">@@ -113,6 +113,7 @@
</span><span class="cx"> virtual void didReceiveData(SubresourceLoader*, const char* data, int size);
</span><span class="cx"> virtual void didFail(SubresourceLoader*, const ResourceError&);
</span><span class="cx"> virtual void didFinishLoading(SubresourceLoader*);
</span><ins>+ virtual void receivedCancellation(SubresourceLoader*, const AuthenticationChallenge&);
</ins><span class="cx">
</span><span class="cx"> void processSyncLoadResults(const Vector<char>& data, const ResourceResponse&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>