diff -Naur httpd-2.2.0.org/modules/cache/cache_util.c httpd-2.2.0/modules/cache/cache_util.c --- httpd-2.2.0.org/modules/cache/cache_util.c 2005-11-10 16:20:05.000000000 +0100 +++ httpd-2.2.0/modules/cache/cache_util.c 2006-04-26 22:29:57.559885397 +0200 @@ -296,11 +296,12 @@ } /* handle expiration */ - if (((smaxage != -1) && (age < (smaxage - minfresh))) || + if (age*MSEC_ONE_SEC <= conf->maxex && + (((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)))) { + (age < (apr_time_sec(info->expire - info->date) + maxstale - minfresh))))) { const char *warn_head; warn_head = apr_table_get(h->resp_hdrs, "Warning");