From: Eric Covener Date: Sat, 9 Aug 2014 21:20:50 +0000 (+0000) Subject: PR56832 -- mod_ratelimit reports at ERROR level evertyime a lower-level filter X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e72c4d48b62d5a6247b387a7abbbe4488bc78aa3;p=thirdparty%2Fapache%2Fhttpd.git PR56832 -- mod_ratelimit reports at ERROR level evertyime 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 c87f5c98198..552fdab99e6 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 278aa1b5396..7b26eda9ad0 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; }