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:23 UTC
svn commit: r1642855 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/aaa/mod_authnz_fcgi.c modules/proxy/mod_proxy_fcgi.c
Author: jim
Date: Tue Dec 2 12:47:22 2014
New Revision: 1642855
URL: http://svn.apache.org/r1642855
Log:
Merge r1640040, r1640042 from trunk:
mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
when parsing or forwarding the response fails.
Follow up to r1640040: CHANGES entry.
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/modules/aaa/mod_authnz_fcgi.c
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1640040,1640042
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1642855&r1=1642854&r2=1642855&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:22 2014
@@ -17,6 +17,9 @@ Changes with Apache 2.4.11
request headers earlier. Adds "MergeTrailers" directive to restore
legacy behavior. [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
+ *) mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an
+ error when parsing or forwarding the response fails. [Yann Ylavic]
+
*) 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>]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1642855&r1=1642854&r2=1642855&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Dec 2 12:47:22 2014
@@ -137,14 +137,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_proxy_wstunnel-aborted.patch
+1: ylavic, covener, jim
- * mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
- when parsing or forwarding the response fails.
- trunk patch: http://svn.apache.org/r1640040
- http://svn.apache.org/r1640042
- 2.4.x patch: trunk works (modulo CHANGES)
- +1: ylavic, trawick, jim
-
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_fcgi.c?rev=1642855&r1=1642854&r2=1642855&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_fcgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_authnz_fcgi.c Tue Dec 2 12:47:22 2014
@@ -642,6 +642,10 @@ static apr_status_t handle_response(cons
"%d", fn, type);
break;
}
+ /* Leave on above switch's inner error. */
+ if (rv != APR_SUCCESS) {
+ break;
+ }
/*
* Read/discard any trailing padding.
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c?rev=1642855&r1=1642854&r2=1642855&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_fcgi.c Tue Dec 2 12:47:22 2014
@@ -681,6 +681,10 @@ recv_again:
"Got bogus record %d", type);
break;
}
+ /* Leave on above switch's inner error. */
+ if (rv != APR_SUCCESS) {
+ break;
+ }
if (plen) {
rv = get_data_full(conn, iobuf, plen);