You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2015/12/08 00:43:01 UTC
svn commit: r1718496 - /httpd/httpd/trunk/modules/cache/mod_cache.c
Author: covener
Date: Mon Dec 7 23:43:01 2015
New Revision: 1718496
URL: http://svn.apache.org/viewvc?rev=1718496&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/modules/cache/mod_cache.c
Modified: httpd/httpd/trunk/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?rev=1718496&r1=1718495&r2=1718496&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.c Mon Dec 7 23:43:01 2015
@@ -1410,14 +1410,8 @@ static apr_status_t cache_save_filter(ap
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;
}