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/05/07 14:49:40 UTC
svn commit: r1592998 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/proxy/mod_proxy_fcgi.c
Author: jim
Date: Wed May 7 12:49:40 2014
New Revision: 1592998
URL: http://svn.apache.org/r1592998
Log:
Merge r1590437, r1592500 from trunk:
mod_proxy_fcgi: Don't segfault when failing to connect to the backend.
now understood why users haven't reported the segfault (yet) when mod_proxy_fcgi
can't connect to the application
Submitted by: trawick
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/proxy/mod_proxy_fcgi.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1590437,1592500
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1592998&r1=1592997&r2=1592998&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed May 7 12:49:40 2014
@@ -2,6 +2,9 @@
Changes with Apache 2.4.10
+ *) mod_proxy_fcgi: Don't segfault when failing to connect to the backend.
+ (regression in 2.4.9 release) [Jeff Trawick]
+
*) mod_authn_socache: Fix crash at startup in certain configurations.
PR 56371. (regression in 2.4.7) [Jan Kaluza]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1592998&r1=1592997&r2=1592998&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed May 7 12:49:40 2014
@@ -100,11 +100,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_proxy_fcgi: Don't crash when connect to the backend fails.
- trunk patch: http://svn.apache.org/r1590437 (and additional CHANGES tweak in r1592500)
- 2.4.x patch: trunk patch works other than CHANGES
- +1: trawick, covener, ylavic
-
* mod_expires: don't add Expires header to error responses (4xx/5xx),
be they generated or forwarded. PR 55669.
trunk patch: http://svn.apache.org/r1584430
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=1592998&r1=1592997&r2=1592998&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 Wed May 7 12:49:40 2014
@@ -758,7 +758,7 @@ static int proxy_fcgi_handler(request_re
int status;
char server_portstr[32];
conn_rec *origin = NULL;
- proxy_conn_rec *backend;
+ proxy_conn_rec *backend = NULL;
proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config,
&proxy_module);