Commit 82268a0a authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent b6287550
Loading
Loading
Loading
Loading
+0 −4
Changes for STATUS: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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:
+2 −2
Changes for modules/proxy/mod_proxy_ajp.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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;
                }