PR56832 -- mod_ratelimit reports at ERROR level everytime a lower-level filter

encounters an error. Since the core output filter only emits TRACE1, a higher
level filter shouldn't log the same condition as ERROR.

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

diff --git a/CHANGES b/CHANGES
index c87f5c98198a654f23c7a14c5921d0d58b0b94c3..552fdab99e635db0fc66cd9b58815154525ad928 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_ratelimit: Drop severity of AH01455 and AH01457 (ap_pass_brigade
+     failed) messages from ERROR to TRACE1.  Other filters do not bother 
+     re-reporting failures from lower level filters.  PR56832.  [Eric Covener]
+
   *) mod_proxy_http: Proxy responses with error status and
      "ProxyErrorOverride On" hang until proxy timeout.
      PR53420 [Rainer Jung]

diff --git a/modules/filters/mod_ratelimit.c b/modules/filters/mod_ratelimit.c
index 278aa1b5396a1902a265256b94aa8563a0c3a863..7b26eda9ad0caa6be0bc859e04861db95f07c225 100644 (file)
--- a/modules/filters/mod_ratelimit.c
+++ b/modules/filters/mod_ratelimit.c
@@ -145,7 +145,7 @@ rate_limit_filter(ap_filter_t *f, apr_bucket_brigade *input_bb)
 
             if (rv != APR_SUCCESS) {
                 ctx->state = RATE_ERROR;
-                ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, APLOGNO(01455)
+                ap_log_rerror(APLOG_MARK, APLOG_TRACE1, rv, f->r, APLOGNO(01455)
                               "rl: full speed brigade pass failed.");
             }
         }
@@ -217,7 +217,7 @@ rate_limit_filter(ap_filter_t *f, apr_bucket_brigade *input_bb)
 
                 if (rv != APR_SUCCESS) {
                     ctx->state = RATE_ERROR;
-                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, APLOGNO(01457)
+                    ap_log_rerror(APLOG_MARK, APLOG_TRACE1, rv, f->r, APLOGNO(01457)
                                   "rl: brigade pass failed.");
                     break;
                 }