From: Graham Leggett <minfrin@apache.org>
Date: Sat, 16 Oct 2010 23:42:25 +0000 (+0000)
Subject: Fix the return values in the cache_select() function, we don't return APR
X-Git-Tag: 2.3.9~303
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44584f6a5a91799dc2e497d36d647b2d6a60683d;p=thirdparty%2Fapache%2Fhttpd.git

Fix the return values in the cache_select() function, we don't return APR
error codes in this case.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1023390 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index 457f63c70a2..fc5cc465c67 100644
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -206,13 +206,13 @@ int cache_select(cache_request_rec *cache, request_rec *r)
         ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, r->server,
                      "cache: No cache request information available for key"
                      " generation");
-        return APR_EGENERAL;
+        return DECLINED;
     }
 
     if (!cache->key) {
         rv = cache_generate_key(r, r->pool, &cache->key);
         if (rv != APR_SUCCESS) {
-            return rv;
+            return DECLINED;
         }
     }