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 e0622d01bc7d5839261d77ea92234d5e9d20cdf8..e8eae5837bcc2eca6cd9fe45e9b6799f898d6858 100644 (file)
--- 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 83333217806b0a2c6f737b92e2bc737020333853..9150727d6257c693f1be505e7f3413b8fb77a19a 100644 (file)
--- 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");
         }