merge from trunk:

  *) mod_cache: Eliminate a bogus error in the log when a filter returns
     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]

Reviewed by: minfrin, wrowe, trawick

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

diff --git a/CHANGES b/CHANGES
index 2be0f177a7ea9820c441ae5ec330de69f53215f1..fc9be8f1c737f35194452466272b9e68322b3d9a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.4
 
+  *) mod_cache: Eliminate a bogus error in the log when a filter returns
+     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
+
   *) Fix issue which could cause piped loggers to be orphaned and never
      terminate after a graceful restart.  PR 40651.  [Joe Orton,
      Ruediger Pluem]

diff --git a/STATUS b/STATUS
index 6d52aab4895e0065be889f8542c24abfc3fe17e7..eddafdcf6cfeeeec78321fb7c21d66c0ad816c7e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -211,11 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       +1: minfrin, jim, wrowe
         wrowe asks; should ptr mobj->m be nulled out for safety's sake?
 
-    * mod_cache: Eliminate a bogus error in the log when a filter returns
-      AP_FILTER_ERROR.
-      Trunk: http://svn.apache.org/viewvc?view=rev&rev=450453
-      +1: minfrin, wrowe
-
     * mod_authnz_ldap: Add an AuthLDAPRemoteUserAttribute directive. If
       set, REMOTE_USER will be set to this attribute, rather than the
       username supplied by the user. Useful for example when you want users

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index fe93f7da84809d5d3c6bbbf222b66aae369b7634..707aaf77b088bbc5e01f85ba76f58d00e1eb0515 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -225,10 +225,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;
     }