diff options
| author | Eric Covener <covener@apache.org> | 2015-12-08 00:43:01 +0100 |
|---|---|---|
| committer | Eric Covener <covener@apache.org> | 2015-12-08 00:43:01 +0100 |
| commit | aa543e759a4b96171a20afb67883b6b46a4995f5 (patch) | |
| tree | 020139800226a32db9f1e20c72b841467d6834e3 /modules/cache | |
| parent | duplicate debug-level AH00764 in the just-validated path. (diff) | |
| download | apache2-aa543e759a4b96171a20afb67883b6b46a4995f5.tar.xz apache2-aa543e759a4b96171a20afb67883b6b46a4995f5.zip | |
remove dead code leftover from r1023387.
Prior to this revision, there was an apr_atoi64 in this context.
Now, ap_cache_control() sets control.max_age (which is checked here) when
the maxage value was parsed OK.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1718496 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache')
| -rw-r--r-- | modules/cache/mod_cache.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index 461c47309c..4f7f25a582 100644 --- a/modules/cache/mod_cache.c +++ b/modules/cache/mod_cache.c @@ -1410,14 +1410,8 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) if (control.max_age) { apr_int64_t x; - errno = 0; - x = control.max_age_value; - if (errno) { - x = dconf->defex; - } - else { - x = x * MSEC_ONE_SEC; - } + x = control.max_age_value * MSEC_ONE_SEC; + if (x < dconf->minex) { x = dconf->minex; } |