[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[japhet at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1e31314e481e56bd6cc6fb5ea86a9b8774ae194f
Author: japhet at chromium.org <japhet at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 22:53:31 2010 +0000

    2010-08-31  Nate Chapin  <japhet at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Regression in r63528: Custom http headers for loads of type
            FrameLoadTypeReloadFromOrigin are not being correctly
            propagated to subresource loads.
    
            https://bugs.webkit.org/show_bug.cgi?id=44987
    
            No tests, since DRT doesn't seem to have a way to trigger a
            FrameLoadTypeReloadFromOrigin load.
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::addExtraFieldsToRequest):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66549 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0f0c623..7efe10f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-31  Nate Chapin  <japhet at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Regression in r63528: Custom http headers for loads of type
+        FrameLoadTypeReloadFromOrigin are not being correctly
+        propagated to subresource loads.
+
+        https://bugs.webkit.org/show_bug.cgi?id=44987
+
+        No tests, since DRT doesn't seem to have a way to trigger a
+        FrameLoadTypeReloadFromOrigin load.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::addExtraFieldsToRequest):
+
 2010-08-31  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index de14cdf..b47ae5a 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -2645,17 +2645,19 @@ void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadTyp
             request.setCachePolicy(documentLoader()->originalRequest().cachePolicy());
         else
             request.setCachePolicy(UseProtocolCachePolicy);
-    } else if (loadType == FrameLoadTypeReload) {
-        request.setCachePolicy(ReloadIgnoringCacheData);
-        request.setHTTPHeaderField("Cache-Control", "max-age=0");
-    } else if (loadType == FrameLoadTypeReloadFromOrigin) {
-        request.setCachePolicy(ReloadIgnoringCacheData);
-        request.setHTTPHeaderField("Cache-Control", "no-cache");
-        request.setHTTPHeaderField("Pragma", "no-cache");
-    } else if (request.isConditional())
+    } else if (loadType == FrameLoadTypeReload || loadType == FrameLoadTypeReloadFromOrigin || request.isConditional())
         request.setCachePolicy(ReloadIgnoringCacheData);
     else if (isBackForwardLoadType(loadType) && m_stateMachine.committedFirstRealDocumentLoad() && !request.url().protocolIs("https"))
         request.setCachePolicy(ReturnCacheDataElseLoad);
+        
+    if (request.cachePolicy() == ReloadIgnoringCacheData) {
+        if (loadType == FrameLoadTypeReload)
+            request.setHTTPHeaderField("Cache-Control", "max-age=0");
+        else if (loadType == FrameLoadTypeReloadFromOrigin) {
+            request.setHTTPHeaderField("Cache-Control", "no-cache");
+            request.setHTTPHeaderField("Pragma", "no-cache");
+        }
+    }
     
     if (mainResource)
         request.setHTTPAccept(defaultAcceptHeader);

-- 
WebKit Debian packaging