Commit ac475f39 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1724847, r1725516 from trunk: 

flush errors are TRACE1 in the core output filter now.



Remove APLOGNO after moving log message to
TRACE1 in r1724847.

Submitted by: covener, rjung
Reviewed/backported by: jim


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

CHANGES

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


Changes with Apache 2.4.19



  *) 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]



  *) mod_rewrite: Avoid looping on relative substitutions that

     result in the same filename we started with. PR 58854.

     [Eric Covener]

STATUS

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

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



  *) mod_rewrite: Avoid looping on relative substitutions that

     result in the same filename we started with. 

     PR 58854.

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

     2.4.x: trunk works

     +1 covener, jim, rjung



  *) mod_cgid: drop severity of flush error message to match

     core output filter.

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

     2.4.x: trunk works.

     +1 covener, jim, rjung

     rjung: you might also want to add r1725516 (removing

            APLOGNO, now that the log level is TRACE1)



  *) 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

modules/generators/mod_cgid.c

+2 −4
Original line number Diff line number Diff line
@@ -1673,10 +1673,8 @@ static int cgid_handler(request_rec *r) 


        rv = ap_pass_brigade(r->output_filters, bb);

        if (rv != APR_SUCCESS) { 

            /* APLOG_ERR because the core output filter message is at error,

             * but doesn't know it's passing CGI output 

             */

            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(02550) "Failed to flush CGI output to client");

            ap_log_rerror(APLOG_MARK, APLOG_TRACE1, rv, r,

                          "Failed to flush CGI output to client");

        }

    }