[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 119b1aa24ed598c38ba72d86c6ece8e8a9d66648
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 26 19:22:58 2002 +0000

    2002-03-26  Kenneth Kocienda  <kocienda at apple.com>
    
            Moved a constant that need not be visible externally into the .m file.
    
            * CacheLoader.subproj/IFHTTPURLProtocolHandler.h:
    
            Protocol handlers are now given an opportunity to act upon an object that
            will be returned from cache. This is so that things like cached HTTP
            response headers can be set properly.
    
            I also added some code to check to see if a cached object needs revalidation
            as described the HTTP RFC sections on caching. This is not fully implemented
            yet, but the support for revalidation is better than it was.
    
            * CacheLoader.subproj/IFHTTPURLProtocolHandler.m: (-[IFHTTPURLProtocolHandler
            performHTTPHeaderRead:]), (-[IFHTTPURLProtocolHandler willReturnCacheObject:]),
            (-[IFHTTPURLProtocolHandler cacheObjectIsValid:]), (-[IFHTTPURLProtocolHandler
            cacheObjectRequiresRevalidation:]), (-[IFHTTPURLProtocolHandler
            shouldCacheResourceData]):
    
            Added a version field that will allow the cache to tell when incompatible
            changes have been made to the cache format.
    
            * CacheLoader.subproj/IFURLCacheObject.h:
            * CacheLoader.subproj/IFURLCacheObject.m: (-[IFURLCacheObject initWithCoder:]),
            (-[IFURLCacheObject encodeWithCoder:]):
    
            Added support for more sophisticated cache checking, using the new protocol
            handler methods.
    
            * CacheLoader.subproj/IFURLLoad.m: (-[IFURLLoad returnCacheObject:]),
            (+[IFURLLoad IFURLLoadCacheCheckerRun:]):
    
            Cached attributes are now returned properly from memory cached objects.
    
            * CacheLoader.subproj/IFURLMemoryCache.m:
    
            Changed name of isValidCacheObject: method to willReturnCacheObject:
            Added new cacheObjectRequiresRevalidation: method.
    
            These now support improved cache checking and object validation
    
            * CacheLoader.subproj/IFURLProtocolHandler.h:
            * CacheLoader.subproj/IFURLProtocolHandler.m: (-[IFURLProtocolHandler
            willReturnCacheObject:]), (-[IFURLProtocolHandler cacheObjectIsValid:]),
            (-[IFURLProtocolHandler cacheObjectRequiresRevalidation:]):
    
            Added nil check for returned cache object
    
            * Database.subproj/IFURLFileDatabase.m: (-[IFURLFileDatabase objectForKey:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@852 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 5d92e39..e2f6586 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -273,7 +273,7 @@ enum
         unarchiver = [[NSUnarchiver alloc] initForReadingWithData:data];
         fileKey = [unarchiver decodeObject];
         object = [unarchiver decodeObject];
-        if ([fileKey isEqual:key]) {
+        if (object && [fileKey isEqual:key]) {
             // make sure this object stays around until client has had a chance at it
             result = [object retain];
             [result autorelease];

-- 
WebKit Debian packaging