From: Jim Jagielski <jim@apache.org>
Date: Wed, 7 May 2014 12:49:40 +0000 (+0000)
Subject: Merge r1590437, r1592500 from trunk:
X-Git-Tag: 2.4.10~258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98b495a1dc210d7c9e0a4da2b8bd8d2275133875;p=apache

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


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

diff --git a/CHANGES b/CHANGES
index a1042bf5b6..613eac5cbc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/STATUS b/STATUS
index 1296ae8d25..b91a6cbb84 100644
--- a/STATUS
+++ b/STATUS
@@ -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
diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index dd2607c344..be4c3a21e4 100644
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -758,7 +758,7 @@ static int proxy_fcgi_handler(request_rec *r, proxy_worker *worker,
     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);