[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 068507d95d685d0f3587f698668e32193874bbb1
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 18 22:29:19 2002 +0000

    2002-03-18  Kenneth Kocienda  <kocienda at apple.com>
    
            Changed file load thread so that it tries to use a memory-mapped file to
            read from the file system instead of using CFStreams. Now more than 2x faster.
    
            * CacheLoader.subproj/IFFileURLProtocolHandler.h:
            * CacheLoader.subproj/IFFileURLProtocolHandler.m: (-[IFFileURLProtocolHandler
            didLoadData:]), (-[IFFileURLProtocolHandler fileLoadThread]),
            (-[IFFileURLProtocolHandler beginLoadInBackground]), (-[IFFileURLProtocolHandler
            endLoadInBackground]):
    
            Changed instance of memcpy to the new IFFastMemoryMove function
    
            * CacheLoader.subproj/IFHTTPURLProtocolHandler.m: (-[IFHTTPURLProtocolHandler
            performStreamRead:]):
    
            Moved timeout back to 60 seconds from 240 seconds.
    
            * CacheLoader.subproj/IFURLLoad.m:
    
            NSData now reads from a mapped file instead of using NSFileManager to read the file.
    
            * Database.subproj/IFURLFileDatabase.m: (-[IFURLFileDatabase objectForKey:]):
            * WebFoundation.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@775 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 1f0e95f..d40bd88 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -147,7 +147,7 @@ static NSNumber *IFURLFilePosixPermissions;
 
     filePath = [NSString stringWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
     
-    data = [[NSFileManager defaultManager] contentsAtPath:filePath];
+    data = [[NSData alloc] initWithContentsOfMappedFile:filePath];
 
     if (data) {
         unarchiver = [[NSUnarchiver alloc] initForReadingWithData:data];
@@ -159,6 +159,7 @@ static NSNumber *IFURLFilePosixPermissions;
             [result autorelease];
         }
         [unarchiver release];
+        [data release];
     }
 
     return result;

-- 
WebKit Debian packaging