From: Jim Jagielski <jim@apache.org>
Date: Wed, 7 Aug 2013 11:44:33 +0000 (+0000)
Subject: Merge r1503990, r1503991 from trunk:
X-Git-Tag: 2.4.7~316
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e43dc33e18abe744c1e6043c560154362778f607;p=apache

Merge r1503990, r1503991 from trunk:

Have static analyser tool happy.
Point 2 of PR 54936

Potential use of uninitialized memory.
Point 3 of PR 54936
Submitted by: jailletc36
Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index 2fdc6378b2..6d55406245 100644
--- a/STATUS
+++ b/STATUS
@@ -93,16 +93,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-  * easy votes:
-     	- Have static analyser tool happy
-        - Potential use of uninitialized memory
-    PR54936 [Zhenbo Xu <zhenbo1987 gmail com>]
-    trunk: http://svn.apache.org/r1503990
-           http://svn.apache.org/r1503991
-    2.4.x patch: trunk patches work
-    +1: jailletc36, trawick, jim
-
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 67dc93943b..5dff7f458b 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -386,7 +386,7 @@ PROXY_DECLARE(int) ap_proxyerror(request_rec *r, int statuscode, const char *mes
 static const char *
      proxy_get_host_of_request(request_rec *r)
 {
-    char *url, *user = NULL, *password = NULL, *err, *host;
+    char *url, *user = NULL, *password = NULL, *err, *host = NULL;
     apr_port_t port;
 
     if (r->hostname != NULL) {
diff --git a/server/scoreboard.c b/server/scoreboard.c
index bef2b90908..24e9bc61fa 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -389,7 +389,7 @@ AP_DECLARE(void) ap_increment_counts(ap_sb_handle_t *sb, request_rec *r)
 AP_DECLARE(int) ap_find_child_by_pid(apr_proc_t *pid)
 {
     int i;
-    int max_daemons_limit;
+    int max_daemons_limit = 0;
 
     ap_mpm_query(AP_MPMQ_MAX_DAEMONS, &max_daemons_limit);