From: Graham Leggett Date: Mon, 16 May 2011 19:25:07 +0000 (+0000) Subject: Both lastmod and lastmods resolve to 0 when unset, but only lastmods is a X-Git-Tag: 2.3.13~125 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef3dbf5cbdff8f74b266d88d6b52d73b1cb8a08e;p=thirdparty%2Fapache%2Fhttpd.git Both lastmod and lastmods resolve to 0 when unset, but only lastmods is a pointer. Fix comparison between apr_time_t and NULL. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103850 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index fae4546ad08..cfeec0257b5 100644 --- a/modules/cache/mod_cache.c +++ b/modules/cache/mod_cache.c @@ -973,7 +973,7 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) } else if (!dconf->store_expired && (control.must_revalidate || control.proxy_revalidate) && (!control.s_maxage_value - || (!control.s_maxage && !control.max_age_value)) && lastmod + || (!control.s_maxage && !control.max_age_value)) && lastmods == NULL && etag == NULL) { /* if we're already stale, but can never revalidate, don't cache it */ reason