httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r411464 - in /httpd/httpd/trunk: CHANGES modules/cache/cache_util.c
Date Sat, 03 Jun 2006 19:41:49 GMT
Author: rpluem
Date: Sat Jun  3 12:41:49 2006
New Revision: 411464

URL: http://svn.apache.org/viewvc?rev=411464&view=rev
Log:
* info->expire and info->date are in microseconds. So convert the difference
  to seconds before comparing it to age which is in seconds.

PR: 39713
Submitted by: Owen Taylor <otaylor redhat.com>
Reviewed by: rpluem

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/cache/cache_util.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=411464&r1=411463&r2=411464&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Jun  3 12:41:49 2006
@@ -2,9 +2,13 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) mod_authnz_ldap: Fix a problem with invalid auth error detection for 
-     LDAP client SDKs that don't support LDAP_SECURITY_ERROR macro. PR#39529
-     [Ray Price <dohrayme yahoo.com>], [Josh Fenlason <jfenlason ptc.com>]
+  *) mod_cache: Convert age of cached object to seconds before comparing it to
+     age supplied by the request when checking whether to send a Warning
+     header for a stale response. PR 39713. [Owen Taylor <otaylor redhat.com>]
+
+  *) mod_authnz_ldap: Fix a problem with invalid auth error detection for
+     LDAP client SDKs that don't support LDAP_SECURITY_ERROR macro. PR 39529.
+     [Ray Price <dohrayme yahoo.com>, Josh Fenlason <jfenlason ptc.com>]
 
   *) mod_cache: Do not overwrite the Content-Type in the cache, for
      successfully revalidated cached objects. PR 39647. [Ruediger Pluem]

Modified: httpd/httpd/trunk/modules/cache/cache_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.c?rev=411464&r1=411463&r2=411464&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Sat Jun  3 12:41:49 2006
@@ -314,7 +314,7 @@
         if (!(((smaxage != -1) && age < smaxage) ||
               ((maxage != -1) && age < maxage) ||
               (info->expire != APR_DATE_BAD &&
-               (info->expire - info->date) > age))) {
+               (apr_time_sec(info->expire - info->date)) > age))) {
             /* make sure we don't stomp on a previous warning */
             if ((warn_head == NULL) ||
                 ((warn_head != NULL) && (ap_strstr_c(warn_head, "110") == NULL)))
{



Mime
View raw message