[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 de16ee12fdf0b186dab2e98d1150574c2ee27815
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 6 18:11:37 2003 +0000

            Reviewed by Richard
    
    	Refactored memory and disk cache. All the implementation
    	for the memory and disk caches are now concentrated in one
    	file, NSURLCache.m. This spells the end for the WebCache,
    	WebMemoryCache and WebDiskCache files. It also enabled
    	me to implement the API-approved design which calls upon
    	NSURLProtocol to make a determination about the cache
    	equivalence of cached objects.
    
    	NSURLRequest and friends are now codable.
    
    	WebLRUFileList gets a new function: WebLRUFileListContainsItem.
    
    	In WebNSFileManagerExtras, I fixed a gibberish method name:
    
    	_web_deleteBackgroundRemoveLeftoverFiles:
    		is now
    	_web_backgroundRemoveLeftoverFiles:
    
            * CacheLoader.subproj/NSURLCache.m:
            (-[NSURLCacheInternal dealloc]):
            (-[NSURLCacheNode initWithCachedResponse:request:key:]):
            (-[NSURLCacheNode isEqual:]):
            (-[NSURLCacheNode description]):
            (-[NSURLCacheNode dealloc]):
            (MemoryCacheRemoveNodeFromLRUList):
            (MemoryCacheAppendNodeToLRUList):
            (MemoryCacheTouchNode):
            (MemoryCacheTruncate):
            (MemoryCacheGet):
            (MemoryCacheSet):
            (MemoryCacheRemove):
            (MemoryCacheClear):
            (DiskCacheDefaultPath):
            (DiskCacheUniqueFilePathForKey):
            (DiskCacheCreateDirectory):
            (DiskCacheGet):
            (DiskCacheClear):
            (DiskCacheTruncate):
            (DiskCacheScheduleWrite):
            (DiskCacheExecuteWrite):
            (DiskCacheScheduleRemoval):
            (DiskCacheExecuteRemoval):
            (+[NSURLCache _diskCacheSyncLoop:]):
            (-[NSURLCache _setDiskCacheSyncTimer]):
            (-[NSURLCache _diskCacheSync:]):
            (-[NSURLCache _createDiskCacheLRUList:]):
            (NSURLCacheInit):
            (NSURLCacheCreateSharedInstance):
            (+[NSURLCache sharedURLCache]):
            (-[NSURLCache initWithMemoryCapacity:diskCapacity:diskPath:]):
            (-[NSURLCache cachedResponseForRequest:]):
            (-[NSURLCache storeCachedResponse:forRequest:]):
            (-[NSURLCache removeCachedResponseForRequest:]):
            (-[NSURLCache removeAllCachedResponses]):
            (-[NSURLCache memoryCapacity]):
            (-[NSURLCache diskCapacity]):
            (-[NSURLCache setMemoryCapacity:]):
            (-[NSURLCache setDiskCapacity:]):
            (-[NSURLCache currentMemoryUsage]):
            (-[NSURLCache currentDiskUsage]):
            (-[NSURLCache _cacheStatistics]):
            * CacheLoader.subproj/NSURLRequest.h:
            * CacheLoader.subproj/NSURLRequest.m:
            (-[NSURLRequest initWithCoder:]):
            (-[NSURLRequest encodeWithCoder:]):
            (-[NSURLRequest HTTPMethod]):
            (-[NSURLRequest allHTTPHeaderFields]):
            (-[NSURLRequest valueForHTTPHeaderField:]):
            (-[NSURLRequest HTTPBody]):
            (-[NSURLRequest allowsHTTPSCertificatesWithUnknownRoots]):
            (-[NSURLRequest HTTPCookiePolicyBaseURL]):
            (-[NSURLRequest HTTPExtraCookies]):
            (-[NSURLRequest HTTPPageNotFoundCacheLifetime]):
            (-[NSURLRequest HTTPShouldHandleCookies]):
            (-[NSMutableURLRequest _parametersForWriting]):
            (-[NSMutableURLRequest setHTTPMethod:]):
            (-[NSMutableURLRequest setAllHTTPHeaderFields:]):
            (-[NSMutableURLRequest setValue:forHTTPHeaderField:]):
            (-[NSMutableURLRequest addValue:forHTTPHeaderField:]):
            (-[NSMutableURLRequest setHTTPBody:]):
            (-[NSMutableURLRequest setAllowsHTTPSCertificatesWithUnknownRoots:]):
            (-[NSMutableURLRequest setHTTPCookiePolicyBaseURL:]):
            (-[NSMutableURLRequest setHTTPExtraCookies:]):
            (-[NSMutableURLRequest setHTTPPageNotFoundCacheLifetime:]):
            (-[NSMutableURLRequest setHTTPShouldHandleCookies:]):
            (-[NSHTTPURLRequestParameters initWithCoder:]):
            (-[NSHTTPURLRequestParameters encodeWithCoder:]):
            (-[NSHTTPURLRequestParameters copyWithZone:]):
            (-[NSHTTPURLRequestParameters mutableCopyWithZone:]):
            (-[NSHTTPURLRequestParameters isEqual:]):
            * CacheLoader.subproj/WebCache.h: Removed.
            * CacheLoader.subproj/WebCache.m: Removed.
            * CacheLoader.subproj/WebCachePrivate.h: Removed.
            * CacheLoader.subproj/WebDiskCache.h: Removed.
            * CacheLoader.subproj/WebDiskCache.m: Removed.
            * CacheLoader.subproj/WebMemoryCache.h: Removed.
            * CacheLoader.subproj/WebMemoryCache.m: Removed.
            * Database.subproj/WebFileDatabase.m:
            (-[WebFileDatabase open]):
            * Database.subproj/WebLRUFileList.h:
            * Database.subproj/WebLRUFileList.m:
            (WebLRUFileListContainsItem):
            * Misc.subproj/WebNSFileManagerExtras.h:
            * Misc.subproj/WebNSFileManagerExtras.m:
            (-[NSFileManager _web_backgroundRemoveLeftoverFiles:]):
            * WebFoundation.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4290 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 10fe478..35f5f04 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -536,7 +536,7 @@ static void databaseInit()
 	}
 
         // remove any leftover turds
-        [manager _web_deleteBackgroundRemoveLeftoverFiles:path];
+        [manager _web_backgroundRemoveLeftoverFiles:path];
         
         if (isOpen) {
             [NSThread detachNewThreadSelector:@selector(_createLRUList:) toTarget:self withObject:nil];

-- 
WebKit Debian packaging