[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 baffd70bf394b628992457571fdf3d4071de9c72
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 2 23:14:19 2002 +0000

    WebFoundation:
    
    	Implemented HTTP-specific subclass for WebResourceResponse.
    
            * CacheLoader.subproj/IFURLHandleC.h:
            * CacheLoader.subproj/IFURLHandleC.m:
            (IFURLHandleBackgroundLoadFailedWithResultCode):
            (IFURLHandleGetResultCode):
            * CacheLoader.subproj/WebCacheLoaderConstants.h:
            * CacheLoader.subproj/WebResourceHandle.m:
            (-[WebResourceHandle cancel]):
            * CacheLoader.subproj/WebResourceLoad.m:
            (-[WebResourceLoad failedWithResultCode:inDomain:failingURL:]):
            * CacheLoader.subproj/WebResourceResponse.h:
            * CacheLoader.subproj/WebResourceResponse.m:
            (-[WebResourceResponse init]):
            (-[WebResourceResponse initWithCoder:]):
            (-[WebResourceResponse encodeWithCoder:]):
            (-[WebResourceResponse _takePersistentValuesFrom:]):
            (-[WebResourceResponse dealloc]):
            * CacheLoader.subproj/WebResourceResponsePrivate.h:
            * Misc.subproj/WebError.h:
            * ProtocolHandlers.subproj/WebCFNetworkHTTPProtocolHandler.m:
            (-[WebCFNetworkHTTPProtocolHandler performHTTPHeaderRead:andCall:]):
            * ProtocolHandlers.subproj/WebHTTPProtocolHandler.m:
            (-[WebHTTPProtocolHandler responseClass]):
            (-[WebHTTPProtocolHandler setResponseMetadata:]):
            (-[WebHTTPProtocolHandler shouldCacheResponse:]):
            (-[WebHTTPProtocolHandler cacheableAttributesWithDefaults:]):
            * ProtocolHandlers.subproj/WebHTTPResourceResponse.h:
            * ProtocolHandlers.subproj/WebHTTPResourceResponse.m:
            * ProtocolHandlers.subproj/WebHTTPResourceResponsePrivate.h: Added.
            * ProtocolHandlers.subproj/WebSimpleHTTPProtocolHandler.m:
            (-[WebSimpleHTTPProtocolHandler _examineHeaders]):
            * WebFoundation.exp:
            * WebFoundation.pbproj/project.pbxproj:
    
    WebKit:
    
    	Implemented HTTP-specific subclass for WebResourceResponse.
    
            * Plugins.subproj/WebPluginStream.m:
            (-[WebNetscapePluginStream receivedData:]): Add import for WebHTTPResourceResponse.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2231 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0b500ba..ef38d0f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-02  Ken Kocienda  <kocienda at apple.com>
+
+	Implemented HTTP-specific subclass for WebResourceResponse.
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream receivedData:]): Add import for WebHTTPResourceResponse.
+
 2002-10-02  Darin Adler  <darin at apple.com>
 
 	Add return value to willSendRequest callback.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 0b500ba..ef38d0f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-10-02  Ken Kocienda  <kocienda at apple.com>
+
+	Implemented HTTP-specific subclass for WebResourceResponse.
+
+        * Plugins.subproj/WebPluginStream.m:
+        (-[WebNetscapePluginStream receivedData:]): Add import for WebHTTPResourceResponse.
+
 2002-10-02  Darin Adler  <darin at apple.com>
 
 	Add return value to willSendRequest callback.
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 109e0f2..489003e 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -19,6 +19,7 @@
 #import <WebFoundation/WebResourceHandle.h>
 #import <WebFoundation/WebResourceRequest.h>
 #import <WebFoundation/WebResourceResponse.h>
+#import <WebFoundation/WebHTTPResourceResponse.h>
 
 @interface WebNetscapePluginStream (ClassInternal)
 - (void)receivedData:(NSData *)data;
@@ -124,9 +125,13 @@
         char *cURL = (char *)malloc([URLString cStringLength]+1);
         [URLString getCString:cURL];
 
-        NSNumber *timeInterval = [[response headers] objectForKey:@"Last-Modified"];
+        NSNumber *timeInterval = nil;
         uint32 lastModified;
         
+        if ([response isKindOfClass:[WebHTTPResourceResponse class]]) {
+            timeInterval = [[(WebHTTPResourceResponse *)response headers] objectForKey:@"Last-Modified"];
+        }
+
         if(timeInterval){
             NSTimeInterval lastModifiedInterval = [[NSDate dateWithTimeIntervalSinceReferenceDate:[timeInterval doubleValue]] timeIntervalSince1970];
             if(lastModifiedInterval < 0){

-- 
WebKit Debian packaging