From: Jim Jagielski <jim@apache.org>
Date: Tue, 2 Dec 2014 12:47:58 +0000 (+0000)
Subject: Merge r1635644 from trunk:
X-Git-Tag: 2.4.11~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8cab06468efdd55185d05b16f6f7fb0df632382d;p=apache

Merge r1635644 from trunk:

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

Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1642856 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 0c7b2a03e6..884947fc05 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,6 +23,9 @@ Changes with Apache 2.4.11
   *) mod_ssl: Fix a memory leak in case of graceful restarts with OpenSSL >= 0.9.8e
      PR 53435 [tadanori <tadanori2007 yahoo.com>, Sebastian Wiedenroth <wiedi frubar.net>]
 
+  *) mod_proxy_wstunnel: abort backend connection on polling error to avoid
+     further processing.  [Yann Ylavic]
+
   *) core: Support custom ErrorDocuments for HTTP 501 and 414 status codes.
      PR 57167 [Edward Lu <Chaosed0 gmail.com>]
 
diff --git a/STATUS b/STATUS
index accba2050f..b96bb8980d 100644
--- a/STATUS
+++ b/STATUS
@@ -131,12 +131,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patches: trunk works (modulo CHANGES).
      +1: ylavic, covener, jim
 
-   * mod_proxy_wstunnel: abort backend connection on polling error to avoid
-     further processing (lingering close, SSL shutdown).
-     trunk patch: http://svn.apache.org/r1635644
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_proxy_wstunnel-aborted.patch
-     +1: ylavic, covener, jim
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index 5fb8eb66e8..1eb6ac89ef 100644
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -248,6 +248,7 @@ static int proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
                 }
                 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");
                 }