[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 270583e670bd09e7030caf6b5e4f1157650e7e65
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 7 23:33:57 2004 +0000

            Reviewed by Darin and Dave (many weeks ago....I am so ashamed for not landing)
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge expiresTimeForResponse:]): Now adds in the difference between
            the Mac OS X epoch and the "standard" unix epoch when passing back a time
            that WebCore will use for its cache expiration determinations.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6327 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ac549ce..22b240a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-07  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin and Dave (many weeks ago....I am so ashamed for not landing)
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge expiresTimeForResponse:]): Now adds in the difference between
+        the Mac OS X epoch and the "standard" unix epoch when passing back a time
+        that WebCore will use for its cache expiration determinations. 
+
 2004-04-07  Richard Williamson   <rjw at apple.com>
 
 	Fix for 3604388.  The runtime version check (_CFExecutableLinkedOnOrAfter) used by many of
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index e0981e0..15da3c6 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -496,6 +496,7 @@
     // has been around long enough for everyone to have it.
     if ([response respondsToSelector:@selector(_calculatedExpiration)]) {
         NSTimeInterval expiration = [response _calculatedExpiration];
+        expiration += kCFAbsoluteTimeIntervalSince1970;
         return expiration > MAX_TIME_T ? MAX_TIME_T : expiration;
     }
 

-- 
WebKit Debian packaging