httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1661305 - in /httpd/httpd/branches/2.4.x: STATUS modules/proxy/mod_proxy_connect.c
Date Sat, 21 Feb 2015 09:20:19 GMT
Author: jailletc36
Date: Sat Feb 21 09:20:19 2015
New Revision: 1661305

URL: http://svn.apache.org/r1661305
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1661305&r1=1661304&r2=1661305&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Feb 21 09:20:19 2015
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c?rev=1661305&r1=1661304&r2=1661305&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_connect.c Sat Feb 21 09:20:19 2015
@@ -459,7 +459,7 @@ static int proxy_connect_handler(request
                 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");
                 }
             }



Mime
View raw message