You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2006/01/13 14:14:23 UTC
svn commit: r368705 - in /httpd/httpd/branches/2.2.x: STATUS
modules/proxy/mod_proxy_http.c
Author: niq
Date: Fri Jan 13 05:14:18 2006
New Revision: 368705
URL: http://svn.apache.org/viewcvs?rev=368705&view=rev
Log:
Backport r366279 (proxy_http patch by rpluem)
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=368705&r1=368704&r2=368705&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Jan 13 05:14:18 2006
@@ -104,11 +104,6 @@
http://svn.apache.org/viewcvs.cgi/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=356030&view=diff&r1=356030&r2=332306
+1: jim, rpluem, mturk
- * mod_proxy: Call ap_proxy_http_cleanup after ap_log_rerror
- because it resets backend->hostname to NULL.
- http://svn.apache.org/viewcvs.cgi?rev=366279&view=rev
- +1: rpluem, mturk, niq
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c?rev=368705&r1=368704&r2=368705&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c Fri Jan 13 05:14:18 2006
@@ -1220,10 +1220,10 @@
len = ap_getline(buffer, sizeof(buffer), rp, 0);
}
if (len <= 0) {
- ap_proxy_http_cleanup(NULL, r, backend);
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"proxy: error reading status line from remote "
"server %s", backend->hostname);
+ ap_proxy_http_cleanup(NULL, r, backend);
return ap_proxyerror(r, HTTP_BAD_GATEWAY,
"Error reading from remote server");
}