[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 17cdea83b987932f59f413424a1f5989055dd35b
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 1 16:33:48 2003 +0000

    Tests:
    
            Reviewed by Darin
    
    	Updated to use approved NSHTTPCookieStorage API.
    	Note that there are some discrepancies in the
    	test results, but they seem to be the result
    	of changes in the way we handle cookie paths,
    	an aspect of cookies I did not change at all
    	with this patch. The difference must have
    	crept in some time ago.
    
            * CookieManager/wkcookie-test.chk:
            * CookieManager/wkcookiemanager-test.chk:
            * CookieManager/wkcookiemanager-test.m:
            (main):
    
    WebFoundation:
    
            Reviewed by Darin
    
            Updated to provide and use approved NSHTTPCookieStorage API.
    
            +sharedCookieManager -> +sharedHTTPCookieStorage
            -setAcceptPolicy: -> -setCookieAcceptPolicy:
            -acceptPolicy -> -cookieAcceptPolicy
    	-cookieRequestHeaderFieldsForURL: -> -cookiesForURL:
    	-setCookiesFromResponseHeader:forURL:policyBaseURL: -> -setCookies:forURL:mainDocumentURL:
    
    	Added back compare: method in NSHTTPCookie. Our tests use it.
    
            * CookieManager.subproj/NSHTTPCookie.m:
            (-[NSHTTPCookie compare:]):
            * CookieManager.subproj/NSHTTPCookieStorage.h:
            * CookieManager.subproj/NSHTTPCookieStorage.m:
            (-[NSHTTPCookieStorage _cookieRequestHeaderFieldsForURL:withExtraCookies:]):
            (-[NSHTTPCookieStorage _cookiesForURL:withExtraCookies:]):
            (-[NSHTTPCookieStorage init]):
            (+[NSHTTPCookieStorage sharedHTTPCookieStorage]):
            (-[NSHTTPCookieStorage cookiesForURL:]):
            (-[NSHTTPCookieStorage setCookies:forURL:mainDocumentURL:]):
            (-[NSHTTPCookieStorage cookieAcceptPolicy]):
            (-[NSHTTPCookieStorage setCookieAcceptPolicy:]):
            * CookieManager.subproj/NSHTTPCookieStoragePrivate.h:
            * ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
            (-[WebCFNetworkHTTPProtocol addCookieFieldToHeader]):
            (-[WebCFNetworkHTTPProtocol setResponseHeaderUsingHTTPResponse:andCall:context:]):
            * ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
            (-[WebSimpleHTTPProtocol buildHTTPRequest]):
            (-[WebSimpleHTTPProtocol _parseHeaderFromData:]):
    
    WebKit:
    
            Reviewed by Darin
    
            Updated to use approved NSHTTPCookieStorage API.
    
            +sharedCookieManager -> +sharedHTTPCookieStorage
            -acceptPolicy -> -cookieAcceptPolicy
            -cookieRequestHeaderFieldsForURL: -> -cookiesForURL:
            -setCookiesFromResponseHeader:forURL:policyBaseURL: -> -setCookies:forURL:mainDocumentURL:
    
            * WebCoreSupport.subproj/WebCookieAdapter.m:
            (-[WebCookieAdapter cookiesEnabled]):
            (-[WebCookieAdapter cookiesForURL:]):
            (-[WebCookieAdapter setCookies:forURL:policyBaseURL:]):
    
    WebBrowser:
    
            Reviewed by Darin
    
    	Updated to use approved NSHTTPCookieStorage API.
    
    	+sharedCookieManager -> +sharedHTTPCookieStorage
    	-setAcceptPolicy: -> -setCookieAcceptPolicy:
    	-acceptPolicy -> -cookieAcceptPolicy
    
            * AppController.m:
            (-[AppController deleteAllCookies]):
            * Preferences.subproj/AcceptedCookies.m:
            (-[AcceptedCookies updateCookieData]):
            (-[AcceptedCookies removeSelectedItems:]):
            (-[AcceptedCookies registerForCookieChangeNotifications]):
            * Preferences.subproj/SecurityPreferences.m:
            (-[SecurityPreferences takeCookiePolicyFrom:]):
            (-[SecurityPreferences updateCookiesViews]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 921428e..c8b22ad 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,19 @@
+2003-05-01  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+        Updated to use approved NSHTTPCookieStorage API.
+
+        +sharedCookieManager -> +sharedHTTPCookieStorage
+        -acceptPolicy -> -cookieAcceptPolicy
+        -cookieRequestHeaderFieldsForURL: -> -cookiesForURL:
+        -setCookiesFromResponseHeader:forURL:policyBaseURL: -> -setCookies:forURL:mainDocumentURL:
+
+        * WebCoreSupport.subproj/WebCookieAdapter.m:
+        (-[WebCookieAdapter cookiesEnabled]):
+        (-[WebCookieAdapter cookiesForURL:]):
+        (-[WebCookieAdapter setCookies:forURL:policyBaseURL:]):
+
 2003-05-01  Darin Adler  <darin at apple.com>
 
         * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
diff --git a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
index e4e4616..ee3f01e 100644
--- a/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
+++ b/WebKit/WebCoreSupport.subproj/WebCookieAdapter.m
@@ -26,21 +26,25 @@
 {
     BOOL result;
 
-    NSHTTPCookieAcceptPolicy acceptPolicy = [[NSHTTPCookieStorage sharedCookieManager] acceptPolicy];
-    result = (acceptPolicy == NSHTTPCookieAcceptPolicyAlways || acceptPolicy == NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain);
+    NSHTTPCookieAcceptPolicy cookieAcceptPolicy = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookieAcceptPolicy];
+    result = (cookieAcceptPolicy == NSHTTPCookieAcceptPolicyAlways || cookieAcceptPolicy == NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain);
     
     return result;
 }
 
-- (NSString *)cookiesForURL:(NSString *)URL
+- (NSString *)cookiesForURL:(NSString *)URLString
 {
-    return [[[NSHTTPCookieStorage sharedCookieManager] cookieRequestHeaderFieldsForURL:[NSURL _web_URLWithString:URL]] objectForKey:@"Cookie"];
+    NSURL *URL = [NSURL _web_URLWithString:URLString];
+    NSArray *cookiesForURL = [[NSHTTPCookieStorage sharedHTTPCookieStorage] cookiesForURL:URL];
+    NSDictionary *header = [NSHTTPCookie requestHeaderFieldsWithCookies:cookiesForURL];
+    return [header objectForKey:@"Cookie"];
 }
 
-- (void)setCookies:(NSString *)cookies forURL:(NSString *)URL policyBaseURL:(NSString *)policyBaseURL
+- (void)setCookies:(NSString *)cookieString forURL:(NSString *)URLString policyBaseURL:(NSString *)policyBaseURL
 {
-    [[NSHTTPCookieStorage sharedCookieManager] setCookiesFromResponseHeader:[NSDictionary dictionaryWithObject:cookies forKey:@"Set-Cookie"]
-        forURL:[NSURL _web_URLWithString:URL] policyBaseURL:[NSURL _web_URLWithString:policyBaseURL]];    
+    NSURL *URL = [NSURL _web_URLWithString:URLString];
+    NSArray *cookies = [NSHTTPCookie cookiesWithResponseHeaderFields:[NSDictionary dictionaryWithObject:cookieString forKey:@"Set-Cookie"] forURL:URL];
+    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookies:cookies forURL:URL mainDocumentURL:[NSURL _web_URLWithString:policyBaseURL]];    
 }
 
 @end

-- 
WebKit Debian packaging