Blame SOURCES/httpd-2.4.35-cachehardmax.patch

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