From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 21 Feb 2015 09:20:19 +0000 (+0000)
Subject: Merge r1656230 from trunk
X-Git-Tag: 2.4.13~415
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=699daa1825f5a5d2c0fd1191d200f8f7eea1f9d7;p=apache

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

diff --git a/STATUS b/STATUS
index 817087df73..c2f10daff4 100644
--- a/STATUS
+++ b/STATUS
@@ -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 ]
diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c
index 2a34a15b00..55079148f0 100644
--- a/modules/proxy/mod_proxy_connect.c
+++ b/modules/proxy/mod_proxy_connect.c
@@ -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");
                 }
             }