Commit d3d954dc authored by Christophe Jaillet's avatar Christophe Jaillet
Browse files

Merge r1656230 from trunk 

   * mod_proxy_connect: fix duplicated AH introduced by r1635645
      (and merged to 2.4.11 in r1642857)

Submitted by: ylavic
Reviewed by: ylavic, jailletc36, minfrin
Backported by: jailletc36

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

STATUS

+0 −6
Changes for STATUS: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -131,12 +131,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: trunk works

     +1: jailletc36, mrumph, minfrin



   * mod_proxy_connect: fix duplicated AH introduced by r1635645

                        (and merged to 2.4.11 in r1642857).

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

     2.4.x patch: trunk works (modulo docs/log-message-tags)

     +1: ylavic, jailletc36, minfrin





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

modules/proxy/mod_proxy_connect.c

+1 −1
Changes for modules/proxy/mod_proxy_connect.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, 
                else if (pollevent & APR_POLLERR) {

                    rv = APR_EPIPE;

                    c->aborted = 1;

                    ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(01026)

                    ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02827)

                                  "err on client");

                }

            }