You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/12/02 13:47:59 UTC
svn commit: r1642856 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
docs/manual/rewrite/advanced.xml modules/proxy/mod_proxy_wstunnel.c
Author: jim
Date: Tue Dec 2 12:47:58 2014
New Revision: 1642856
URL: http://svn.apache.org/r1642856
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml (props changed)
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1635644
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1642856&r1=1642855&r2=1642856&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Dec 2 12:47:58 2014
@@ -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>]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1642856&r1=1642855&r2=1642856&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Dec 2 12:47:58 2014
@@ -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 ]
Propchange: httpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk/docs/manual/rewrite/advanced.xml:r1635644
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c?rev=1642856&r1=1642855&r2=1642856&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_wstunnel.c Tue Dec 2 12:47:58 2014
@@ -248,6 +248,7 @@ static int proxy_wstunnel_request(apr_po
}
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");
}