arrfab / rpms / httpd

Forked from rpms/httpd 5 years ago
Clone

Blame SOURCES/httpd-2.4.4-cachehardmax.patch

28b219
diff --git a/modules/cache/cache_util.h b/modules/cache/cache_util.h
28b219
index eec38f3..1a2d5ee 100644
28b219
--- a/modules/cache/cache_util.h
28b219
+++ b/modules/cache/cache_util.h
28b219
@@ -194,6 +194,9 @@ typedef struct {
28b219
     unsigned int store_nostore_set:1;
28b219
     unsigned int enable_set:1;
28b219
     unsigned int disable_set:1;
28b219
+    /* treat maxex as hard limit */
28b219
+    unsigned int hardmaxex:1;
28b219
+    unsigned int hardmaxex_set:1;
28b219
 } cache_dir_conf;
28b219
 
28b219
 /* A linked-list of authn providers. */
28b219
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
28b219
index 4f2d3e0..30c88f4 100644
28b219
--- a/modules/cache/mod_cache.c
28b219
+++ b/modules/cache/mod_cache.c
28b219
@@ -1299,6 +1299,11 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
28b219
             exp = date + dconf->defex;
28b219
         }
28b219
     }
28b219
+    /* else, forcibly cap the expiry date if required */
28b219
+    else if (dconf->hardmaxex && (date + dconf->maxex) < exp) {
28b219
+        exp = date + dconf->maxex;
28b219
+    }        
28b219
+
28b219
     info->expire = exp;
28b219
 
28b219
     /* We found a stale entry which wasn't really stale. */
28b219
@@ -1717,7 +1722,9 @@ static void *create_dir_config(apr_pool_t *p, char *dummy)
28b219
 
28b219
     /* array of providers for this URL space */
28b219
     dconf->cacheenable = apr_array_make(p, 10, sizeof(struct cache_enable));
28b219
-
28b219
+    /* flag; treat maxex as hard limit */
28b219
+    dconf->hardmaxex = 0;
28b219
+    dconf->hardmaxex_set = 0;
28b219
     return dconf;
28b219
 }
28b219
 
28b219
@@ -1767,7 +1774,10 @@ static void *merge_dir_config(apr_pool_t *p, void *basev, void *addv) {
28b219
     new->enable_set = add->enable_set || base->enable_set;
28b219
     new->disable = (add->disable_set == 0) ? base->disable : add->disable;
28b219
     new->disable_set = add->disable_set || base->disable_set;
28b219
-
28b219
+    new->hardmaxex = 
28b219
+        (add->hardmaxex_set == 0)
28b219
+        ? base->hardmaxex
28b219
+        : add->hardmaxex;
28b219
     return new;
28b219
 }
28b219
 
28b219
@@ -2096,12 +2106,18 @@ static const char *add_cache_disable(cmd_parms *parms, void *dummy,
28b219
 }
28b219
 
28b219
 static const char *set_cache_maxex(cmd_parms *parms, void *dummy,
28b219
-                                   const char *arg)
28b219
+                                   const char *arg, const char *hard)
28b219
 {
28b219
     cache_dir_conf *dconf = (cache_dir_conf *)dummy;
28b219
 
28b219
     dconf->maxex = (apr_time_t) (atol(arg) * MSEC_ONE_SEC);
28b219
     dconf->maxex_set = 1;
28b219
+    
28b219
+    if (hard && strcasecmp(hard, "hard") == 0) {
28b219
+        dconf->hardmaxex = 1;
28b219
+        dconf->hardmaxex_set = 1;
28b219
+    }
28b219
+
28b219
     return NULL;
28b219
 }
28b219
 
28b219
@@ -2309,7 +2325,7 @@ static const command_rec cache_cmds[] =
28b219
                    "caching is enabled"),
28b219
     AP_INIT_TAKE1("CacheDisable", add_cache_disable, NULL, RSRC_CONF|ACCESS_CONF,
28b219
                   "A partial URL prefix below which caching is disabled"),
28b219
-    AP_INIT_TAKE1("CacheMaxExpire", set_cache_maxex, NULL, RSRC_CONF|ACCESS_CONF,
28b219
+    AP_INIT_TAKE12("CacheMaxExpire", set_cache_maxex, NULL, RSRC_CONF|ACCESS_CONF,
28b219
                   "The maximum time in seconds to cache a document"),
28b219
     AP_INIT_TAKE1("CacheMinExpire", set_cache_minex, NULL, RSRC_CONF|ACCESS_CONF,
28b219
                   "The minimum time in seconds to cache a document"),