httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1511265 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/proxy/proxy_util.c server/scoreboard.c
Date Wed, 07 Aug 2013 11:44:34 GMT
Author: jim
Date: Wed Aug  7 11:44:33 2013
New Revision: 1511265

URL: http://svn.apache.org/r1511265
Log:
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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c
    httpd/httpd/branches/2.4.x/server/scoreboard.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1503990-1503991

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1511265&r1=1511264&r2=1511265&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Aug  7 11:44:33 2013
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c?rev=1511265&r1=1511264&r2=1511265&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/proxy_util.c Wed Aug  7 11:44:33 2013
@@ -386,7 +386,7 @@ PROXY_DECLARE(int) ap_proxyerror(request
 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) {

Modified: httpd/httpd/branches/2.4.x/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/scoreboard.c?rev=1511265&r1=1511264&r2=1511265&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/scoreboard.c (original)
+++ httpd/httpd/branches/2.4.x/server/scoreboard.c Wed Aug  7 11:44:33 2013
@@ -389,7 +389,7 @@ AP_DECLARE(void) ap_increment_counts(ap_
 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);
 



Mime
View raw message