[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 9e626ad6304e3eacac524bbcb555ba6bf2e1f03e
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 17 00:53:37 2003 +0000

            Reviewed by Darin
    
    	Fix for this bug:
    
    	<rdar://problem/3512199>: WebBridge expiresTimeForResponse can be
    	improved to use better expiration calculations
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge expiresTimeForResponse:]): Switch to use new
    	_calculatedExpiration SPI method on NSURLResponse.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5807 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 25ee96a..5985605 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2003-12-16  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+	Fix for this bug:
+
+	<rdar://problem/3512199>: WebBridge expiresTimeForResponse can be 
+	improved to use better expiration calculations
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge expiresTimeForResponse:]): Switch to use new 
+	_calculatedExpiration SPI method on NSURLResponse.
+
 2003-12-15  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3505546>: always get keychain prompt when sending mail using cert downloaded with Safari
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 857f602..9e98c37 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -491,6 +491,14 @@
 
 - (time_t)expiresTimeForResponse:(NSURLResponse *)response
 {
+    // This check can be removed when the new Foundation method
+    // has been around long enough for everyone to have it.
+    if ([response respondsToSelector:@selector(_calculatedExpiration)]) {
+        NSTimeInterval expiration = [response _calculatedExpiration];
+        return expiration > MAX_TIME_T ? MAX_TIME_T : expiration;
+    }
+
+    // Fall back to the older calculation
     time_t now = time(NULL);
     NSTimeInterval lifetime = [response _freshnessLifetime];
     if (lifetime < 0)

-- 
WebKit Debian packaging