WebCore:
2009-03-03 Brady Eidson <beidson@apple.com>
Reviewed by Darin Adler
<rdar://problem/6616664> - Quick looks of various file types is broken
In http://trac.webkit.org/changeset/40553 there was an attempt to prevent NSURLRequest churn
for non-HTTP loads when the underlying ResourceRequest changed. Unfortunately it was a little
overzealous as the mainDocumentURL is relevant for all loads, not only HTTP/HTTPS loads.
Partially reverted behavior to always set the mainDocumentURL in situations when we would've
before that patch.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::addExtraFieldsToRequest):
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::setMainDocumentURL):
WebKitTools:
2009-03-03 Brady Eidson <beidson@apple.com>
Reviewed by Darin Adler
Support layout test covering <rdar://problem/6616664>
Change NSURLRequest/IWebURLRequest dumping to include the mainDocumentURL
* DumpRenderTree/mac/ResourceLoadDelegate.mm:
(-[NSURLRequest _drt_descriptionSuitableForTestResult]): Return both the request URL and the
mainDocumentURL.
* DumpRenderTree/win/ResourceLoadDelegate.cpp:
(descriptionSuitableForTestResult): Return both the request URL and the mainDocumentURL.
LayoutTests:
2009-03-03 Brady Eidson <beidson@apple.com>
Reviewed by Darin Adler
Layout test covering <rdar://problem/6616664> - Quick looks of various file types is broken
Added to test the changes:
* fast/loader/main-document-url-for-non-http-loads-expected.txt: Added.
* fast/loader/main-document-url-for-non-http-loads.html: Added.
* fast/loader/resources/subframe-notify-done.html: Added.
Updated the following for the new info from dumpResourceLoadCallbacks():
* http/tests/misc/window-dot-stop-expected.txt:
* http/tests/xmlhttprequest/abort-should-cancel-load-expected.txt:
* platform/mac-leopard/security/block-test-expected.txt:
* platform/mac-tiger/http/tests/misc/willCacheResponse-delegate-callback-expected.txt:
* platform/mac/http/tests/misc/willCacheResponse-delegate-callback-expected.txt:
* platform/mac/webarchive/loading/cache-expired-subresource-expected.txt:
* security/block-test-expected.txt:
* webarchive/loading/test-loading-archive-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@41398 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index e60f75a..80872ee 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -3579,7 +3579,16 @@
void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadType loadType, bool mainResource, bool cookiePolicyURLFromRequest)
{
- // These modifications are only necessary for HTTP and HTTPS.
+ // Don't set the cookie policy URL if it's already been set.
+ // But make sure to set it on all requests, as it has significance beyond the cookie policy for all protocols (<rdar://problem/6616664>).
+ if (request.mainDocumentURL().isEmpty()) {
+ if (mainResource && (isLoadingMainFrame() || cookiePolicyURLFromRequest))
+ request.setMainDocumentURL(request.url());
+ else if (Page* page = m_frame->page())
+ request.setMainDocumentURL(page->mainFrame()->loader()->url());
+ }
+
+ // The remaining modifications are only necessary for HTTP and HTTPS.
if (!request.url().isEmpty() && !request.url().protocolInHTTPFamily())
return;
@@ -3594,14 +3603,6 @@
request.setHTTPHeaderField("Pragma", "no-cache");
}
- // Don't set the cookie policy URL if it's already been set.
- if (request.mainDocumentURL().isEmpty()) {
- if (mainResource && (isLoadingMainFrame() || cookiePolicyURLFromRequest))
- request.setMainDocumentURL(request.url());
- else if (Page* page = m_frame->page())
- request.setMainDocumentURL(page->mainFrame()->loader()->url());
- }
-
if (mainResource)
request.setHTTPAccept("application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5");
