Fix a NULL variable check in proxy where we were checking the

wrong variable.
PR:
Obtained from:
Submitted by:	Geff Hanoian <geff@pier64.com>
Reviewed by:	Graham Leggett

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@93803 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index 495e5489e0a8e975695556a2ef1d0a5e66db0ca0..e7275d5f7633883a1ed9b544999ad65f4890c13c 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.24
 
+  *) Fix a NULL variable check in proxy where we were checking the
+     wrong variable. [Geff Hanoian <geff@pier64.com>]
+
   *) Fix typo in default config files related to Swedish language
      documents.  PR: 9906, 10040  [Tomas Ögren <stric@ing.umu.se>,
      Dennis Lundberg <dennis.lundberg@mdh.se>]

diff --git a/src/modules/proxy/proxy_cache.c b/src/modules/proxy/proxy_cache.c
index 96e58444253f093fb5631900790bc234d6094cd6..3f37c53de960e82241b4c68589fb249bfd01b0e4 100644 (file)
--- a/src/modules/proxy/proxy_cache.c
+++ b/src/modules/proxy/proxy_cache.c
@@ -1155,7 +1155,7 @@ int ap_proxy_cache_check(request_rec *r, char *url, struct cache_conf *conf,
         smaxage = -1;
 
     /* extract max-age from request */
-    if (cc_cresp && ap_proxy_liststr(cc_req, "max-age", &val))
+    if (cc_req && ap_proxy_liststr(cc_req, "max-age", &val))
         maxage_req =  atoi(val);
     else
         maxage_req = -1;