From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 5 Dec 2014 21:06:31 +0000 (+0000)
Subject: Synch trunk with 2.4.x.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49a27a532cd6a7753f90e83bf5009fad86625156;p=thirdparty%2Fapache%2Fhttpd.git

Synch trunk with 2.4.x.

In r1588495, additionnal logging has been added to 2.4.x as part of the merge.

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

diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index 5028be9deb8..636c5074fcc 100644
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -303,9 +303,12 @@ static apr_status_t proxy_wstunnel_transfer(request_rec *r, conn_rec *c_i, conn_
         }
     } while (rv == APR_SUCCESS);
 
+    ap_log_rerror(APLOG_MARK, APLOG_TRACE2, rv, r, "wstunnel_transfer complete");
+
     if (APR_STATUS_IS_EAGAIN(rv)) {
         rv = APR_SUCCESS;
     }
+
     return rv;
 }