Changeset 28515 in webkit

Timestamp:

Dec 7, 2007 2:17:08 AM (16 years ago)

Author:

ap@webkit.org

Message:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=16325
<rdar://problem/5632997> REGRESSION: www.xerox.ru doesn't work

Test: http/tests/misc/empty-cookie.html

• platform/mac/CookieJar.mm: (WebCore::setCookies): Don't store empty cookies. (WebCore::cookies): Filter out empty cookies if we have them, as they could have been set with an earlier version of Leopard!

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/misc/empty-cookie-expected.txt (added)
• LayoutTests/http/tests/misc/empty-cookie.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/mac/CookieJar.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-12-07  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16325
+        <rdar://problem/5632997> REGRESSION: www.xerox.ru doesn't work
+
+        * http/tests/misc/empty-cookie-expected.txt: Added.
+        * http/tests/misc/empty-cookie.html: Added.
+
 2007-12-06  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-07  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16325
+        <rdar://problem/5632997> REGRESSION: www.xerox.ru doesn't work
+        
+        Test: http/tests/misc/empty-cookie.html
+
+        * platform/mac/CookieJar.mm:
+        (WebCore::setCookies): Don't store empty cookies.
+        (WebCore::cookies): Filter out empty cookies if we have them, as they could have been set
+        with an earlier version of Leopard!
+
 2007-12-06  Ada Chan  <adachan@apple.com>
 

trunk/WebCore/platform/mac/CookieJar.mm

@@ -31 +31 @@
 #import "PlatformString.h"
 
+#import <wtf/RetainPtr.h>
+
+#ifdef BUILDING_ON_TIGER
+typedef unsigned int NSUInteger;
+#endif
+
 namespace WebCore {
 
@@ -39 +45 @@
     NSURL *URL = url.getNSURL();
     NSArray *cookiesForURL = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:URL];
-    NSDictionary *header = [NSHTTPCookie requestHeaderFieldsWithCookies:cookiesForURL];
+
+    // <rdar://problem/5632883> On 10.5, NSHTTPCookieStorage would happily store an empty cookie, which would be sent as "Cookie: =".
+    // We have a workaround in setCookies() to prevent that, but we also need to avoid sending cookies that were previously stored.
+    NSUInteger count = [cookiesForURL count];
+    RetainPtr<NSMutableArray> cookiesForURLFilteredCopy(AdoptNS, [[NSMutableArray alloc] initWithCapacity:count]);
+    for (NSUInteger i = 0; i < count; ++i) {
+        NSHTTPCookie *cookie = (NSHTTPCookie *)[cookiesForURL objectAtIndex:i];
+        if ([[cookie name] length] != 0)
+            [cookiesForURLFilteredCopy.get() addObject:cookie];
+    }
+
+    NSDictionary *header = [NSHTTPCookie requestHeaderFieldsWithCookies:cookiesForURLFilteredCopy.get()];
     return [header objectForKey:@"Cookie"];
 
@@ -49 +66 @@
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
+
+    // <rdar://problem/5632883> On 10.5, NSHTTPCookieStorage would happily store an empty cookie, which would be sent as "Cookie: =".
+    if (cookieStr.isEmpty())
+        return;
 
     NSURL *URL = url.getNSURL();