Merge r1741570 from trunk:

* Silence compiler warning
Submitted by: rpluem
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index b930697a84c5b5bef00ff8fdc4f7075335cbab84..84a5a9cf188dc99f14a02b7066094d1d837e6f4d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -35,7 +35,7 @@ Release history:
           while x.{even}.z versions are Stable/GA releases.]
 
     2.4.26  : In development.
-    2.4.25  : Tagged on December 16, 2016.
+    2.4.25  : Tagged on December 16, 2016. Released on December 21, 2016.
     2.4.24  : Tagged on December 16, 2016, not released.
     2.4.23  : Tagged on June 30, 2016. Released on July 05, 2016.
     2.4.22  : Tagged on June 20, 2016, not released.
@@ -119,12 +119,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy_express.c: Silence compiler warning
-     "111: warning: 'backend' may be used uninitialized in this function"
-     trunk patch: http://svn.apache.org/r1741570
-     2.4.x patch: trunk works
-     +1: rjung, jim, ylavic
-
   *) mod_ssl: Silence compiler warning
      "686: warning: 'ok' may be used uninitialized in
      this function"

diff --git a/modules/proxy/mod_proxy_express.c b/modules/proxy/mod_proxy_express.c
index ec4b94a67d79b4985a9a19e7f05bc632649533a8..0f5d604295c06b08ceefb5a5bc4675e9ea88aeae 100644 (file)
--- a/modules/proxy/mod_proxy_express.c
+++ b/modules/proxy/mod_proxy_express.c
@@ -108,7 +108,7 @@ static int xlate_name(request_rec *r)
 {
     int i;
     const char *name;
-    char *backend;
+    char *backend = NULL;
     apr_dbm_t *db;
     apr_status_t rv;
     apr_datum_t key, val;