From: Eric Covener <covener@apache.org>
Date: Tue, 15 Apr 2014 17:56:00 +0000 (+0000)
Subject: followup to r1587036.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53038bd5b1e9f072460e6aeac2ae433c4854f2ad;p=thirdparty%2Fapache%2Fhttpd.git

followup to r1587036.

if backend->close is set too early, proxy_util.c will close it right
away and then blow away the field.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1587654 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index 7fbafb2007c..3d105e84f92 100644
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -474,7 +474,7 @@ static int proxy_wstunnel_handler(request_rec *r, proxy_worker *worker,
     }
 
     backend->is_ssl = 0;
-    backend->close = 1;
+    backend->close = 0;
 
     retry = 0;
     while (retry < 2) {
@@ -503,6 +503,8 @@ static int proxy_wstunnel_handler(request_rec *r, proxy_worker *worker,
                 break;
          }
 
+        backend->close = 1; /* must be after ap_proxy_determine_connection */
+
         /* Step Three: Process the Request */
         status = ap_proxy_wstunnel_request(p, r, backend, worker, conf, uri, locurl,
                                       server_portstr, scheme);