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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1b62b4f937179125bf7ad6b3622b919761286b81
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 26 16:44:22 2010 +0000

    2010-11-26  Sergio Villar Senin  <svillar at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] SoupCache should not ignore loader's conditional requests
            https://bugs.webkit.org/show_bug.cgi?id=50101
    
            SoupCache must not handle WebKit loader conditional requests and
            thus should never return its own cached response if any. This was
            causing frequent resource load failures as WebCore was trying to
            revalidate its own resources and was not getting any expected
            result.
    
            * platform/network/soup/cache/webkit/soup-cache.c:
            (webkit_soup_cache_has_response): check the presence of
            conditional request headers when deciding whether the cache has a
            valid response for a given request.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72768 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index eab7991..cd1bd9e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-26  Sergio Villar Senin  <svillar at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] SoupCache should not ignore loader's conditional requests
+        https://bugs.webkit.org/show_bug.cgi?id=50101
+
+        SoupCache must not handle WebKit loader conditional requests and
+        thus should never return its own cached response if any. This was
+        causing frequent resource load failures as WebCore was trying to
+        revalidate its own resources and was not getting any expected
+        result.
+
+        * platform/network/soup/cache/webkit/soup-cache.c:
+        (webkit_soup_cache_has_response): check the presence of
+        conditional request headers when deciding whether the cache has a
+        valid response for a given request.
+
 2010-11-26  Jeremy Orlow  <jorlow at chromium.org>
 
         Reviewed by Steve Block.
diff --git a/WebCore/platform/network/soup/cache/webkit/soup-cache.c b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
index faa6114..4835750 100644
--- a/WebCore/platform/network/soup/cache/webkit/soup-cache.c
+++ b/WebCore/platform/network/soup/cache/webkit/soup-cache.c
@@ -1306,7 +1306,13 @@ webkit_soup_cache_has_response (WebKitSoupCache *cache, SoupMessage *msg)
 
 	/* TODO */
 
-	/* 4. The presented request and stored response are free from
+	/* 4. The request is a conditional request issued by the client.
+	 */
+	if (soup_message_headers_get (msg->request_headers, "If-Modified-Since") ||
+	    soup_message_headers_get (msg->request_headers, "If-None-Match"))
+		return WEBKIT_SOUP_CACHE_RESPONSE_STALE;
+
+	/* 5. The presented request and stored response are free from
 	 * directives that would prevent its use.
 	 */
 
@@ -1355,7 +1361,7 @@ webkit_soup_cache_has_response (WebKitSoupCache *cache, SoupMessage *msg)
 		}
 	}
 
-	/* 5. The stored response is either: fresh, allowed to be
+	/* 6. The stored response is either: fresh, allowed to be
 	 * served stale or succesfully validated
 	 */
 	/* TODO consider also proxy-revalidate & s-maxage */

-- 
WebKit Debian packaging