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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 8bf0f44284bcf1b99a63994ba157e433d8c1c775
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 7 21:23:06 2002 +0000

    	Reviewed by: Ken Kocienda
    
    	Fixed the following bugs:
    
    	Radar 2854498 - Cookies are not saved between sessions
    	Radar 2862120 - -[IFCookie dictionaryRepresentation] is not yet implemented
    	Radar 2949513 - Session-only cookies should not be saved persistently
    	Radar 2949514 - Cookies need to be synchronized between multiple processes
    
    	Also, I moved the optimistic first try code for creating
    	directories and files with intermediate directories from the call
    	points to the functions themselves.
    
    	* CookieManager.subproj/IFCookie.h:
    	* CookieManager.subproj/IFCookie.m:
    	(setExpires):
    	(-[IFCookie dictionaryRepresentation]):
    	(+[IFCookie _requestHeadersFromCookieArray:]):
    	(+[IFCookie _cookieArrayFromResponseHeaders:forURL:]):
    	(-[IFCookie _compareForHeaderOrder:]):
    	(-[IFCookie _key]):
    	(-[IFCookie _isExpired]):
    	* CookieManager.subproj/IFCookieManager.m:
    	(-[IFCookieManagerPrivate init]):
    	(-[IFCookieManagerPrivate dealloc]):
    	(-[IFCookieManager _registerForCookiePreferenceNotification]):
    	(-[IFCookieManager _connectToCookieStorage]):
    	(setUpOnLoadThread):
    	(runningOnLoadThread):
    	(-[IFCookieManager _scheduleSetupOnLoadThread]):
    	(-[IFCookieManager _waitForLoadThreadSetup]):
    	(-[IFCookieManager _continueSetCookies:context:]):
    	(-[IFCookieManager _internalInit]):
    	(-[IFCookieManager _cookieRequestHeadersForURL:withExtraCookies:]):
    	(-[IFCookieManager cookies]):
    	(-[IFCookieManager setCookie:]):
    	(-[IFCookieManager deleteCookie:]):
    	(-[IFCookieManager setCookiesFromResponseHeaders:forURL:]):
    	(-[IFCookieManager description]):
    	* CookieManager.subproj/IFCookiePrivate.h:
    	* CookieManager.subproj/IFCookieStorage.h: Added.
    	* CookieManager.subproj/IFCookieStorage.m: Added.
    	(-[IFCookieStoragePrivate init]):
    	(-[IFCookieStoragePrivate dealloc]):
    	(-[IFCookieStorage _updateCookiesFromServer]):
    	(-[IFCookieStorage _connectionDidDie:]):
    	(-[IFCookieStorage _establishConnection]):
    	(-[IFCookieStorage init]):
    	(-[IFCookieStorage initWithNotificationObject:]):
    	(-[IFCookieStorage dealloc]):
    	(-[IFCookieStorage setCookies:]):
    	(-[IFCookieStorage deleteCookies:]):
    	(-[IFCookieStorage cookies]):
    	(-[IFCookieStorage cookiesMatchingDomain:path:secure:]):
    	* CookieManager.subproj/IFCookieStorageServer.h: Added.
    	* CookieManager.subproj/IFCookieStorageServer.m: Added.
    	(-[IFCookieStorageServerPrivate init]):
    	(-[IFCookieStorageServerPrivate dealloc]):
    	(-[IFCookieStorageServer _checkForCookieExpiration:]):
    	(-[IFCookieStorageServer _updateExpirationTimer:]):
    	(-[IFCookieStorageServer _saveCookies]):
    	(-[IFCookieStorageServer _saveCookiesIfScheduled]):
    	(-[IFCookieStorageServer _scheduleSave]):
    	(-[IFCookieStorageServer _notifyChanged]):
    	(-[IFCookieStorageServer _setCookiesWithoutSaving:]):
    	(-[IFCookieStorageServer init]):
    	(-[IFCookieStorageServer dealloc]):
    	(-[IFCookieStorageServer setCookies:]):
    	(-[IFCookieStorageServer deleteCookies:]):
    	(-[IFCookieStorageServer cookies]):
    	(makeCookie):
    	(-[IFCookieStorageServer loadCookies]):
    	* Database.subproj/IFURLFileDatabase.m:
    	(-[IFURLFileDatabase performSetObject:forKey:]):
    	(-[IFURLFileDatabase open]):
    	* Misc.subproj/IFNSArrayExtensions.h:
    	* Misc.subproj/IFNSArrayExtensions.m:
    	* Misc.subproj/IFNSFileManagerExtensions.m:
    	(-[NSFileManager _IF_createDirectoryAtPathWithIntermediateDirectories:attributes:]):
    	(-[NSFileManager _IF_createFileAtPathWithIntermediateDirectories:contents:attributes:directoryAttributes:]):
    	* WebFoundation.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1296 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index ee4d73a..402a305 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -570,7 +570,6 @@ static void databaseInit()
 
 -(void)performSetObject:(id)object forKey:(id)key
 {
-    BOOL result;
     NSString *filePath;
     NSMutableData *data;
     NSDictionary *attributes;
@@ -584,24 +583,20 @@ static void databaseInit()
     WEBFOUNDATIONDEBUGLEVEL(WebFoundationLogDiskCacheActivity, "performSetObject - %s - %s",
         DEBUG_OBJECT(key), DEBUG_OBJECT([IFURLFileDatabase uniqueFilePathForKey:key]));
 
-    result = NO;
-
     data = [NSMutableData data];
     archiver = [[NSArchiver alloc] initForWritingWithMutableData:data];
     [archiver encodeObject:key];
     [archiver encodeObject:object];
     
     attributes = [NSDictionary dictionaryWithObjectsAndKeys:
-        [NSDate date], @"NSFileModificationDate",
-        NSUserName(), @"NSFileOwnerAccountName",
-        IFURLFilePosixPermissions, @"NSFilePosixPermissions",
+        NSUserName(), NSFileOwnerAccountName,
+        IFURLFilePosixPermissions, NSFilePosixPermissions,
         NULL
     ];
 
     directoryAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
-        [NSDate date], @"NSFileModificationDate",
-        NSUserName(), @"NSFileOwnerAccountName",
-        IFURLFileDirectoryPosixPermissions, @"NSFilePosixPermissions",
+        NSUserName(), NSFileOwnerAccountName,
+        IFURLFileDirectoryPosixPermissions, NSFilePosixPermissions,
         NULL
     ];
 
@@ -609,10 +604,7 @@ static void databaseInit()
 
     filePath = [[NSString alloc] initWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
 
-    result = [defaultManager createFileAtPath:filePath contents:data attributes:attributes];
-    if (!result) {
-        result = [defaultManager _IF_createFileAtPathWithIntermediateDirectories:filePath contents:data attributes:attributes directoryAttributes:directoryAttributes];
-    }
+    [defaultManager _IF_createFileAtPathWithIntermediateDirectories:filePath contents:data attributes:attributes directoryAttributes:directoryAttributes];
 
     [archiver release];
     [filePath release];
@@ -671,14 +663,8 @@ static void databaseInit()
                 NULL
             ];
             
-            // be optimistic that full subpath leading to directory exists
-            isOpen = [manager createDirectoryAtPath:path attributes:attributes];
-            if (!isOpen) {
-                // perhaps the optimism did not pay off ...
-                // try again, this time creating full subpath leading to directory
-                isOpen = [manager _IF_createDirectoryAtPathWithIntermediateDirectories:path attributes:attributes];
-            }
-        }
+	    isOpen = [manager _IF_createDirectoryAtPathWithIntermediateDirectories:path attributes:attributes];
+	}
 
         sizeFilePathString = [NSString stringWithFormat:@"%@/%@", path, SIZE_FILE_NAME];
         tmp = [[NSFileManager defaultManager] fileSystemRepresentationWithPath:sizeFilePathString];

-- 
WebKit Debian packaging