svn commit: r1587654 - /httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

[co...@apache.org]

Author: covener
Date: Tue Apr 15 17:56:00 2014
New Revision: 1587654

URL: http://svn.apache.org/r1587654
Log:
followup to r1587036.

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

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c?rev=1587654&r1=1587653&r2=1587654&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Tue Apr 15 17:56:00 2014
@@ -474,7 +474,7 @@ static int proxy_wstunnel_handler(reques
     }
 
     backend->is_ssl = 0;
-    backend->close = 1;
+    backend->close = 0;
 
     retry = 0;
     while (retry < 2) {
@@ -503,6 +503,8 @@ static int proxy_wstunnel_handler(reques
                 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);