Commit 8cad8e0a authored by Rainer Jung's avatar Rainer Jung
Browse files

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
parent d48322dd

STATUS

+0 −9
Changes for STATUS: 0 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -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

modules/aaa/mod_authnz_fcgi.c

+5 −4
Changes for modules/aaa/mod_authnz_fcgi.c: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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,