From: Nick Kew <niq@apache.org>
Date: Fri, 13 Jan 2006 13:14:18 +0000 (+0000)
Subject: Backport r366279 (proxy_http patch by rpluem)
X-Git-Tag: 2.2.1~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a64247d6a738b468927bc304ae3b647f6ca3c44;p=thirdparty%2Fapache%2Fhttpd.git

Backport r366279 (proxy_http patch by rpluem)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@368705 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index e0622d01bc7..e8eae5837bc 100644
--- a/STATUS
+++ b/STATUS
@@ -104,11 +104,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       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:
 
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 83333217806..9150727d625 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1220,10 +1220,10 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
             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");
         }