From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 26 Jul 2016 17:50:34 +0000 (+0000)
Subject: mod_proxy_wstunnel: we want to detect whether some response was sent to
X-Git-Tag: 2.5.0-alpha~1375
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dba4e304b36b0252bffaaccb12f6f275671346d2;p=apache

mod_proxy_wstunnel: we want to detect whether some response was sent to
the client when forwarding data from the backend to the client, not the
reverse.


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

diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index 1c0a01b47f..8b6c12c08c 100644
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -89,7 +89,8 @@ static int proxy_wstunnel_pump(ws_baton_t *baton, apr_time_t timeout, int try_po
                             "backend was readable");
                     done |= ap_proxy_transfer_between_connections(r, backconn,
                                                                   c, bb_i, bb_o,
-                                                                  "backend", NULL,
+                                                                  "backend",
+                                                                  &replied,
                                                                   AP_IOBUFSIZE,
                                                                   0)
                                                                  != APR_SUCCESS;
@@ -113,8 +114,7 @@ static int proxy_wstunnel_pump(ws_baton_t *baton, apr_time_t timeout, int try_po
                             "client was readable");
                     done |= ap_proxy_transfer_between_connections(r, c, backconn,
                                                                   bb_o, bb_i,
-                                                                  "client",
-                                                                  &replied,
+                                                                  "client", NULL,
                                                                   AP_IOBUFSIZE,
                                                                   0)
                                                                  != APR_SUCCESS;