mod_cache: Eliminate a bogus error in the log when a filter returns

AP_FILTER_ERROR.

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

diff --git a/CHANGES b/CHANGES
index 9ba2bd2a22caacd4948a00edeebb3851a435bd5c..51848538b20536d92e8f94d183187e315e3c7726 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_cache: Eliminate a bogus error in the log when a filter returns
+     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
+
   *) mod_disk_cache: Make caching of large files possible on 32bit machines
      by determining whether the cached file should be copied on disk rather
      than loaded into RAM. PR39380 [Niklas Edmundsson <nikke acc.umu.se>]

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 3b34ee338ac98fe408c3bae43cf5116138db53e1..0d0ba0f6fec270701f7599e2960b64c98ba6ddc2 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -244,10 +244,12 @@ static int cache_url_handler(request_rec *r, int lookup)
     out = apr_brigade_create(r->pool, r->connection->bucket_alloc);
     rv = ap_pass_brigade(r->output_filters, out);
     if (rv != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
-                     "cache: error returned while trying to return %s "
-                     "cached data",
-                     cache->provider_name);
+        if(rv != AP_FILTER_ERROR) {
+            ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+                         "cache: error returned while trying to return %s "
+                         "cached data",
+                         cache->provider_name);
+        }
         return rv;
     }