[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 febc15562ae2612381fe99f003fee7ad8457950a
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 28 19:05:21 2002 +0000

    2002-02-28  Ken Kocienda  <kocienda at pobox.com>
    
            Changes focused on fixing this bug:
    
            Radar 2869449 (Pages do not fully render)
    
            This is primarily a bug in the no-copy data object. It was freeing
            bytes earlier than it should have been when it was asked to join all
            its bytes together for writing to the disk cache.
    
            In the course of doing this work, I also made quite a few changes in the IFURLHandle
            and IFURLHandleLoadManager interaction.
    
            * CacheLoader.subproj/IFHTTPURLProtocolHandler.m: (-[IFHTTPURLProtocolHandler
            beginLoadInBackground]), (-[IFHTTPURLProtocolHandler endLoadInBackground]):
            * CacheLoader.subproj/IFURLHandle.m: (-[IFURLHandle cancelLoadInBackground]),
            (-[IFURLHandle loadInForeground:]), (-[IFURLHandle addClient:]), (-[IFURLHandle
            removeClient:]), (-[IFURLHandle backgroundLoadDidBegin]), (-[IFURLHandle
            didLoadData:]), (-[IFURLHandle backgroundLoadComplete]), (-[IFURLHandle
            backgroundLoadFailedWithResultCode:]), (-[IFURLHandle
            notifyClientsBackgroundLoadCancelled]), (-[IFURLHandle
            notifyClientsBackgroundLoadDidBegin]), (-[IFURLHandle notifyClientsDidLoadData]),
            (-[IFURLHandle notifyClientsBackgroundLoadComplete]), (-[IFURLHandle
            notifyClientsBackgroundLoadFailed]):
            * CacheLoader.subproj/IFURLLoad.h:
            * CacheLoader.subproj/IFURLLoad.m: (-[IFURLLoad flags]), (-[IFURLLoad
            succeeded]), (-[IFURLLoad failedWithResultCode:]), (-[IFURLLoad
            canCacheResourceData]), (-[IFURLLoad beginOriginLoad]), (-[IFURLLoad
            didBeginLoading]), (-[IFURLLoad cleanup]):
            * CacheLoader.subproj/IFURLLoadManager.m: (+[IFURLLoadManager initialize]),
            (+[IFURLLoadManager sharedManager]), (-[IFURLLoadManager objectForURL:]),
            (-[IFURLLoadManager setObject:forURL:attributes:expiry:]), (-[IFURLLoadManager
            invalidateURL:]), (-[IFURLLoadManager clearAllCaches]), (-[IFURLLoadManager
            initWithDefaultStack]), (-[IFURLLoadManager requestWithURLHandle:]),
            (-[IFURLLoadManager cancelRequestWithURLHandle:]), (-[IFURLLoadManager
            cancelAllRequestsWithURL:]), (-[IFURLLoadManager cancelAllRequestsInGroup:]),
            (-[IFURLLoadManager caches]), (-[IFURLLoadManager loadDidFinish:]):
            * CacheLoader.subproj/IFURLLoadManagerPrivate.h:
            * CacheLoader.subproj/IFURLLoadPrivate.h:
            * CacheLoader.subproj/IFURLProtocolHandler.h:
            * CacheLoader.subproj/IFURLProtocolHandler.m: (-[IFURLProtocolHandler
            canCacheResourceData]):
            * Database.subproj/IFURLFileDatabase.m: (-[IFURLFileDatabase setObject:forKey:]):
            * Misc.subproj/IFMutableData.h:
            * Misc.subproj/IFMutableDataPrivate.m: (-[IFByteRange copyWithZone:]),
            (-[IFMutableData joinBlocks]):
            * Misc.subproj/IFMutableDataPrivate.m: (-[IFByteRange copyWithZone:]),
            (-[IFMutableData joinBlocks]):
            * WebFoundation.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@677 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 46a34e2..96764dd 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -85,8 +85,8 @@ static NSNumber *IFURLFilePosixPermissions;
 
     data = [NSMutableData data];
     archiver = [[NSArchiver alloc] initForWritingWithMutableData:data];
-    [archiver encodeRootObject:key];
-    [archiver encodeRootObject:object];
+    [archiver encodeObject:key];
+    [archiver encodeObject:object];
     
     // FIXME: [kocienda] Radar 2859368 (IFURLFileDatabase must set correct permissions when creating files)
     attributes = [NSDictionary dictionaryWithObjectsAndKeys:

-- 
WebKit Debian packaging