Changeset 120339 in webkit

Timestamp:

Jun 14, 2012 10:42:18 AM (12 years ago)

Author:

ap@apple.com

Message:

[CFNetwork] XMLHttpRequest incorrectly returns cached responses even when there is a Vary header field
​https://bugs.webkit.org/show_bug.cgi?id=88925

Reviewed by David Kilzer.

Test: http/tests/cache/xhr-vary-header.html

• platform/network/cf/ResourceHandleCFNet.cpp: (WebCore::willCacheResponse): Don't cache the response at all if there is a Vary header field. CFNetwork won't look at it if we allowed the response cached.

• platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::createNSURLConnection): [NSURLResponse copy] is mutable in practice, but we should be nice, and use -mutableCopy. (-[WebCoreResourceHandleAsDelegate connection:willCacheResponse:]): Same fix as in CFNet code.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/cache/resources/xhr-vary-header-response.php (added)
• LayoutTests/http/tests/cache/resources/xhr-vary-header-subframe.html (added)
• LayoutTests/http/tests/cache/xhr-vary-header-expected.txt (added)
• LayoutTests/http/tests/cache/xhr-vary-header.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (modified) (3 diffs)
• Source/WebCore/platform/network/mac/ResourceHandleMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-14  Alexey Proskuryakov  <ap@apple.com>
+
+        [CFNetwork] XMLHttpRequest incorrectly returns cached responses even when there is a Vary header field
+        https://bugs.webkit.org/show_bug.cgi?id=88925
+
+        Reviewed by David Kilzer.
+
+        * http/tests/cache/resources/xhr-vary-header-response.php: Added.
+        * http/tests/cache/resources/xhr-vary-header-subframe.html: Added.
+        * http/tests/cache/xhr-vary-header-expected.txt: Added.
+        * http/tests/cache/xhr-vary-header.html: Added.
+
 2012-06-14  Simon Pena  <spena@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-14  Alexey Proskuryakov  <ap@apple.com>
+
+        [CFNetwork] XMLHttpRequest incorrectly returns cached responses even when there is a Vary header field
+        https://bugs.webkit.org/show_bug.cgi?id=88925
+
+        Reviewed by David Kilzer.
+
+        Test: http/tests/cache/xhr-vary-header.html
+
+        * platform/network/cf/ResourceHandleCFNet.cpp: (WebCore::willCacheResponse): Don't
+        cache the response at all if there is a Vary header field. CFNetwork won't look at
+        it if we allowed the response cached.
+
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::createNSURLConnection): [NSURLResponse copy] is mutable
+        in practice, but we should be nice, and use -mutableCopy.
+        (-[WebCoreResourceHandleAsDelegate connection:willCacheResponse:]): Same fix as in
+        CFNet code.
+
 2012-06-13  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -318 +318 @@
 {
     ResourceHandle* handle = static_cast<ResourceHandle*>(const_cast<void*>(clientInfo));
+    CFURLResponseRef wrappedResponse = CFCachedURLResponseGetWrappedResponse(cachedResponse);
+
+    // Workaround for <rdar://problem/6300990> Caching does not respect Vary HTTP header.
+    // FIXME: WebCore cache has issues with Vary, too (bug 58797, bug 71509).
+    if (CFHTTPMessageRef httpResponse = CFURLResponseGetHTTPResponse(wrappedResponse)) {
+        ASSERT(CFHTTPMessageIsHeaderComplete(httpResponse));
+        RetainPtr<CFStringRef> varyValue = adoptCF(CFHTTPMessageCopyHeaderFieldValue(httpResponse, CFSTR("Vary")));
+        if (varyValue)
+            return 0;
+    }
 
 #if PLATFORM(WIN)
@@ -337 +347 @@
         RetainPtr<CFArrayRef> receiverData(AdoptCF, CFCachedURLResponseCopyReceiverDataArray(cachedResponse));
         cachedResponse = CFCachedURLResponseCreateWithDataArray(kCFAllocatorDefault,
-                                                                CFCachedURLResponseGetWrappedResponse(cachedResponse),
+                                                                wrappedResponse,
                                                                 receiverData.get(),
                                                                 CFCachedURLResponseGetUserInfo(cachedResponse),
@@ -343 +353 @@
 #else
         cachedResponse = CFCachedURLResponseCreateWithUserInfo(kCFAllocatorDefault, 
-                                                               CFCachedURLResponseGetWrappedResponse(cachedResponse),
+                                                               wrappedResponse,
                                                                CFCachedURLResponseGetReceiverData(cachedResponse),
                                                                CFCachedURLResponseGetUserInfo(cachedResponse), 

trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -210 +210 @@
     NSURLRequest *nsRequest = firstRequest().nsURLRequest();
     if (!shouldContentSniff) {
-        NSMutableURLRequest *mutableRequest = [[nsRequest copy] autorelease];
+        NSMutableURLRequest *mutableRequest = [[nsRequest mutableCopy] autorelease];
         wkSetNSURLRequestShouldContentSniff(mutableRequest, NO);
         nsRequest = mutableRequest;
@@ -888 +888 @@
         return nil;
 
+    // Workaround for <rdar://problem/6300990> Caching does not respect Vary HTTP header.
+    // FIXME: WebCore cache has issues with Vary, too (bug 58797, bug 71509).
+    if ([[cachedResponse response] isKindOfClass:[NSHTTPURLResponse class]]
+        && [[(NSHTTPURLResponse *)[cachedResponse response] allHeaderFields] objectForKey:@"Vary"])
+        return nil;
+
     NSCachedURLResponse *newResponse = m_handle->client()->willCacheResponse(m_handle, cachedResponse);
     if (newResponse != cachedResponse)