From a10c76cb434cbdb9e9dde6b0f22fe6e447a9da37 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 25 Aug 2010 14:16:25 +0000 Subject: [PATCH] Merge r986591 from trunk: Don't log errors when we can't send to client, just debug. Submitted by: jfclere Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@989125 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 4 ---- modules/proxy/mod_proxy_ajp.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index b182eb3220d..7beed996cf3 100644 --- a/STATUS +++ b/STATUS @@ -87,10 +87,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_proxy_ajp: Don't log error when client disconnects. - Trunk version of patch: - http://svn.apache.org/viewvc?view=rev&revision=986591 - +1: jfclere, sf, jim PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c index 78f8e402999..ccb0783fc52 100644 --- a/modules/proxy/mod_proxy_ajp.c +++ b/modules/proxy/mod_proxy_ajp.c @@ -471,7 +471,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r, } if (ap_pass_brigade(r->output_filters, output_brigade) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "proxy: error processing body.%s", r->connection->aborted ? " Client aborted connection." : ""); @@ -489,7 +489,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r, APR_BRIGADE_INSERT_TAIL(output_brigade, e); if (ap_pass_brigade(r->output_filters, output_brigade) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "proxy: error processing end"); output_failed = 1; } -- 2.47.2