From: Rainer Jung <rjung@apache.org>
Date: Thu, 5 Feb 2015 21:25:26 +0000 (+0000)
Subject: Merge r1652829 from trunk:
X-Git-Tag: 2.4.13~445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15060a07c531ec8c09cb09fac06abd750dbae2b0;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1652829 from trunk:

mod_authnz_fcgi.c: Silence compiler warnings:

- modules/aaa/mod_authnz_fcgi.c:705: warning:
  'orspbuflen' may be used uninitialized in
  this function
- modules/aaa/mod_authnz_fcgi.c:1235: warning:
  comparison is always false due to limited
  range of data type

Submitted by: rjung
Reviewed by: rjung, ylavic, jailletc36
Backported by: rjung


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

diff --git a/STATUS b/STATUS
index 2ad1e5d054e..6e05972cdb9 100644
--- a/STATUS
+++ b/STATUS
@@ -112,15 +112,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (module CHANGES)
      +1: ylavic, wrowe, minfrin
 
-   * mod_authnz_fcgi.c: Silence compiler warnings:
-         - modules/aaa/mod_authnz_fcgi.c:705: warning:
-           'orspbuflen' may be used uninitialized in this function
-         - modules/aaa/mod_authnz_fcgi.c:1235: warning:
-           comparison is always false due to limited range of data type
-     trunk patch: http://svn.apache.org/r1652829
-     2.4.x patch: trunk works
-     +1: rjung, ylavic, jailletc36
-
    * acinclude.m4: Generate #LoadModule directive in default httpd.conf for
                    every --enable-mpms-shared. PR 53882.
      trunk patch: http://svn.apache.org/r1652930
diff --git a/modules/aaa/mod_authnz_fcgi.c b/modules/aaa/mod_authnz_fcgi.c
index 51b15edd4a6..d99f3918fa3 100644
--- a/modules/aaa/mod_authnz_fcgi.c
+++ b/modules/aaa/mod_authnz_fcgi.c
@@ -702,7 +702,7 @@ static void req_rsp(request_rec *r, const fcgi_provider_conf *conf,
 {
     const char *fn = "req_rsp";
     apr_pool_t *temp_pool;
-    apr_size_t orspbuflen;
+    apr_size_t orspbuflen = 0;
     apr_socket_t *s;
     apr_status_t rv;
     apr_table_t *saved_subprocess_env = 
@@ -1168,7 +1168,7 @@ static const char *fcgi_define_provider(cmd_parms *cmd,
     char *host;
     const char *err, *stype;
     fcgi_provider_conf *conf = apr_pcalloc(cmd->pool, sizeof(*conf));
-    int ca = 0, rc;
+    int ca = 0, rc, port;
 
     fcgi_backend_regex = ap_rxplus_compile(cmd->pool, FCGI_BACKEND_REGEX_STR);
     if (!fcgi_backend_regex) {
@@ -1231,8 +1231,8 @@ static const char *fcgi_define_provider(cmd_parms *cmd,
         host[strlen(host) - 1] = '\0';
     }
 
-    conf->port = atoi(ap_rxplus_pmatch(cmd->pool, fcgi_backend_regex, 2));
-    if (conf->port > 65535) {
+    port = atoi(ap_rxplus_pmatch(cmd->pool, fcgi_backend_regex, 2));
+    if (port > 65535) {
         return apr_pstrcat(cmd->pool,
                            dname, ": backend-address '",
                            argv[ca],
@@ -1242,6 +1242,7 @@ static const char *fcgi_define_provider(cmd_parms *cmd,
 
     conf->backend = argv[ca];
     conf->host = host;
+    conf->port = port;
     ca++;
 
     rv = apr_sockaddr_info_get(&conf->backend_addrs, conf->host,