From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 30 Oct 2014 23:56:27 +0000 (+0000)
Subject: mod_proxy_wstunnel: abort backend connection on polling error to avoid
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51d14144d306c639fba612f557db014f0ad00b33;p=thirdparty%2Fapache%2Fhttpd.git

mod_proxy_wstunnel: abort backend connection on polling error to avoid
further processing (lingering close, SSL shutdown).


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

diff --git a/CHANGES b/CHANGES
index 28e96e35c96..35bb47bdf64 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
  
+  *) mod_proxy_wstunnel: abort backend connection on polling error to avoid
+     further processing.  [Yann Ylavic]
+
   *) mod_buffer: Forward flushed input data immediatly and avoid (unlikely)
      access to freed memory. [Yann Ylavic, Christophe Jaillet]
 
diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index f32ae80e7a5..5028be9deb8 100644
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -90,6 +90,7 @@ static int proxy_wstunnel_pump(ws_baton_t *baton, apr_time_t timeout, int try_as
                 }
                 else if (pollevent & APR_POLLERR) {
                     rv = APR_EPIPE;
+                    backconn->aborted = 1;
                     ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, APLOGNO(02447)
                             "error on backconn");
                 }