Correct the code in ap_check_cache_feshness to check max_age, smax_age,

and expires correctly.
Submitted by:   Thomas Castelle  <tcastelle@generali.fr>
Reviewed and altered by: Paul J. Reder

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100380 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 1c9b55ec1d04b5831e66c2f79e2d859d9b491cdf..3bb131887b9808943965a19ac46f98313f26d2d7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Correct the code in ap_check_cache_feshness to check max_age,
+     smax_age, and expires correctly. Patch submitted by Thomas
+     Castelle [Paul J. Reder]
+
   *) mod_cgid: Restart the cgid daemon if it crashes.  PR 19849
      [Glenn Nielsen <glenn@apache.org>]
 

diff --git a/modules/experimental/cache_util.c b/modules/experimental/cache_util.c
index e0f82c6d7d162110141652d22abf0898230b3612..43fb0b69703ff8dd24fdfc070dd8b3c245100a71 100644 (file)
--- a/modules/experimental/cache_util.c
+++ b/modules/experimental/cache_util.c
@@ -145,7 +145,8 @@ CACHE_DECLARE(int) ap_cache_check_freshness(cache_request_rec *cache,
 {
     apr_int64_t age, maxage_req, maxage_cresp, maxage, smaxage, maxstale;
     apr_int64_t minfresh;
-    const char *cc_cresp, *cc_req, *pragma_cresp;
+    int age_in_errhdr = 0;
+    const char *cc_cresp, *cc_ceresp, *cc_req;
     const char *agestr = NULL;
     char *val;
     apr_time_t age_c = 0;
@@ -184,12 +185,16 @@ CACHE_DECLARE(int) ap_cache_check_freshness(cache_request_rec *cache,
      * 
      */
     cc_cresp = apr_table_get(r->headers_out, "Cache-Control");
+    cc_ceresp = apr_table_get(r->err_headers_out, "Cache-Control");
     cc_req = apr_table_get(r->headers_in, "Cache-Control");
-    /* TODO: pragma_cresp not being used? */
-    pragma_cresp = apr_table_get(r->headers_out, "Pragma");  
+    
     if ((agestr = apr_table_get(r->headers_out, "Age"))) {
         age_c = apr_atoi64(agestr);
     }
+    else if ((agestr = apr_table_get(r->err_headers_out, "Age"))) {
+        age_c = apr_atoi64(agestr);
+        age_in_errhdr = 1;
+    }
 
     /* calculate age of object */
     age = ap_cache_current_age(info, age_c, r->request_time);
@@ -198,6 +203,9 @@ CACHE_DECLARE(int) ap_cache_check_freshness(cache_request_rec *cache,
     if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "s-maxage", &val)) {
         smaxage = apr_atoi64(val);
     }
+    else if (cc_ceresp && ap_cache_liststr(r->pool, cc_ceresp, "s-maxage", &val)) {
+        smaxage = apr_atoi64(val);
+    }
     else {
         smaxage = -1;
     }
@@ -214,6 +222,9 @@ CACHE_DECLARE(int) ap_cache_check_freshness(cache_request_rec *cache,
     if (cc_cresp && ap_cache_liststr(r->pool, cc_cresp, "max-age", &val)) {
         maxage_cresp = apr_atoi64(val);
     }
+    else if (cc_ceresp && ap_cache_liststr(r->pool, cc_ceresp, "max-age", &val)) {
+        maxage_cresp = apr_atoi64(val);
+    }
     else
     {
         maxage_cresp = -1;
@@ -250,33 +261,45 @@ CACHE_DECLARE(int) ap_cache_check_freshness(cache_request_rec *cache,
 
     /* override maxstale if must-revalidate or proxy-revalidate */
     if (maxstale && ((cc_cresp &&
-                      ap_cache_liststr(NULL,
-                                       cc_cresp, "must-revalidate", NULL))
-                     || (cc_cresp &&
-                         ap_cache_liststr(NULL,
-                                          cc_cresp,
-                                          "proxy-revalidate", NULL)))) {
+                      ap_cache_liststr(NULL, cc_cresp,
+                                       "must-revalidate", NULL)) ||
+                     (cc_cresp &&
+                      ap_cache_liststr(NULL, cc_cresp,
+                                       "proxy-revalidate", NULL)) ||
+                     (cc_ceresp &&
+                      ap_cache_liststr(NULL, cc_ceresp,
+                                       "must-revalidate", NULL)) ||
+                     (cc_ceresp &&
+                      ap_cache_liststr(NULL, cc_ceresp,
+                                       "proxy-revalidate", NULL)))) {
         maxstale = 0;
     }
     /* handle expiration */
-    if ((-1 < smaxage && age < (smaxage - minfresh)) ||
-        (-1 < maxage && age < (maxage + maxstale - minfresh)) ||
-        (info->expire != APR_DATE_BAD &&
-         age < (apr_time_sec(info->expire - info->date) + maxstale - minfresh))) {
+    if (((smaxage != -1) && (age < (smaxage - minfresh))) ||
+        ((maxage != -1) && (age < (maxage + maxstale - minfresh))) ||
+        ((smaxage == -1) && (maxage == -1) &&
+         (info->expire != APR_DATE_BAD) &&
+         (age < (apr_time_sec(info->expire - info->date) + maxstale - minfresh)))) {
         /* it's fresh darlings... */
         /* set age header on response */
-        apr_table_set(r->headers_out, "Age",
-                      apr_psprintf(r->pool, "%lu", (unsigned long)age));
+        if (age_in_errhdr) {
+            apr_table_set(r->err_headers_out, "Age",
+                          apr_psprintf(r->pool, "%lu", (unsigned long)age));
+        }
+        else {
+            apr_table_set(r->headers_out, "Age",
+                          apr_psprintf(r->pool, "%lu", (unsigned long)age));
+        }
 
         /* add warning if maxstale overrode freshness calculation */
-        if (!((-1 < smaxage && age < smaxage) ||
-              (-1 < maxage && age < maxage) ||
+        if (!(((smaxage != -1) && age < smaxage) ||
+              ((maxage != -1) && age < maxage) ||
               (info->expire != APR_DATE_BAD &&
                (info->expire - info->date) > age))) {
             /* make sure we don't stomp on a previous warning */
             apr_table_merge(r->headers_out, "Warning", "110 Response is stale");
         }
-        return 1;    /* Cache object is fresh */
+        return 1;    /* Cache object is fresh (enough) */
     }
     return 0;        /* Cache object is stale */
 }