Commit 16e5bfb0 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1724857 from trunk: 

 
  *) mod_proxy_fcgi: Suppress HTTP error 503 and message 01075, 
     "Error dispatching request", when the cause appears to be 
     the client closing the connection. 

PR58118.  

Submitted By: Tobias Adolph <adolph lrz.de>
Committed By: covener


Submitted by: covener
Reviewed/backported by: jim


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

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,12 @@ 


Changes with Apache 2.4.19





  *) mod_proxy_fcgi: Suppress HTTP error 503 and message 01075, 

     "Error dispatching request", when the cause appears to be 

     due to the client closing the connection. 

     PR58118.  [Tobias Adolph <adolph lrz.de>]



  *) mod_cgid: Message AH02550, failure to flush a response to the client,

     is now logged at TRACE1 level to match the underlying core output filter

     severity.  [Eric Covener]

STATUS

+0 −8
Original line number Diff line number Diff line
@@ -112,14 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_proxy_fcgi: Suppress HTTP error 503 and message 01075,

     "Error dispatching request", when the cause appears to be

     the client closing the connection. PR58118

     trunk patch:  http://svn.apache.org/r1724857

     2.4.x patch: trunk works

     +1 covener, jim, rjung







PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/proxy/mod_proxy_fcgi.c

+10 −0
Original line number Diff line number Diff line
@@ -833,6 +833,16 @@ static int fcgi_do_request(apr_pool_t *p, request_rec *r, 
    rv = dispatch(conn, conf, r, temp_pool, request_id,

                  &err, &bad_request, &has_responded);

    if (rv != APR_SUCCESS) {

        /* If the client aborted the connection during retrieval or (partially)

         * sending the response, dont't return a HTTP_SERVICE_UNAVAILABLE, since

         * this is not a backend problem. */

        if (r->connection->aborted) {

            ap_log_rerror(APLOG_MARK, APLOG_TRACE1, rv, r, 

                          "The client aborted the connection.");

            conn->close = 1;

            return OK;

        }



        ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01075)

                      "Error dispatching request to %s: %s%s%s",

                      server_portstr,