summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2014-08-09 23:20:50 +0200
committerEric Covener <covener@apache.org>2014-08-09 23:20:50 +0200
commitb2e9e97dfb7a42f5272e587338a4f63fa273bfe2 (patch)
treeb6aa4d31f4082436237356e0d99b40e3a277fb9b
parentSome changes for mod_authnz_fcgi doc. (diff)
downloadapache2-b2e9e97dfb7a42f5272e587338a4f63fa273bfe2.tar.xz
apache2-b2e9e97dfb7a42f5272e587338a4f63fa273bfe2.zip
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
-rw-r--r--CHANGES4
-rw-r--r--modules/filters/mod_ratelimit.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index c87f5c9819..552fdab99e 100644
--- 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 278aa1b539..7b26eda9ad 100644
--- 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;
}