From: Jim Jagielski <jim@apache.org>
Date: Fri, 5 Sep 2014 14:21:41 +0000 (+0000)
Subject: Merge r1617018 from trunk:
X-Git-Tag: 2.4.11~299
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31ee59f405cb4f3f51923e7e29e99e45e6aec6e5;p=apache

Merge r1617018 from trunk:

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.


Submitted by: covener
Reviewed/backported by: jim


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

diff --git a/CHANGES b/CHANGES
index 10d9d67d30..a95ec7e666 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.11
 
+  *) 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]
+
   *) core: Avoid useless warning message when parsing a section guarded by
      <IfDefine foo> if $(foo) is used within the section.
      PR 56503 [Christophe Jaillet]
diff --git a/STATUS b/STATUS
index 3dfd976156..979af4f6ef 100644
--- a/STATUS
+++ b/STATUS
@@ -101,22 +101,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * Add some missing APLOGNO.
-     Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable.
-     Split some lines longer than 80.
-     Improve alignment.
-     trunk patch:
-        http://svn.apache.org/r1611978
-        http://svn.apache.org/r1612068
-     2.4.x patch: trunk patch works
-     +1: jailletc36, ylavic, jim
-
-   * 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.
-     trunk patch: http://svn.apache.org/r1617018
-     2.4.x patch: trunk works
-     +1 covener, ylavic, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/modules/filters/mod_ratelimit.c b/modules/filters/mod_ratelimit.c
index 939ab8e966..59e130e781 100644
--- a/modules/filters/mod_ratelimit.c
+++ b/modules/filters/mod_ratelimit.c
@@ -146,7 +146,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.");
             }
         }
@@ -218,7 +218,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;
                 }