Commit fb2811fb authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Fix configuration of internal proxies 

PR: 49272
Submitted by: Jim Riggs <jim riggs me>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1185828 13f79535-47bb-0310-9956-ffa450edef68
parent 70042026

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ Changes with Apache 2.3.15 
     PR 51714. [Stefan Fritsch, Jim Jagielski, Ruediger Pluem, Eric Covener,

     <lowprio20 gmail.com>]



  *) mod_remote_ip: Fix configuration of internal proxies. PR 49272.

     [Jim Riggs <jim riggs me>]



  *) mpm_winnt: Handle AcceptFilter 'none' mode correctly; resolve specific

     server IP endpoint and remote client IP upon connection.  [William Rowe]

modules/metadata/mod_remoteip.c

+5 −5
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int looks_like_ip(const char *ipstr) 
    return (*ipstr == '\0');

}



static const char *proxies_set(cmd_parms *cmd, void *internal,

static const char *proxies_set(cmd_parms *cmd, void *cfg,

                               const char *arg)

{

    remoteip_config_t *config = ap_get_module_config(cmd->server->module_config,
@@ -142,7 +142,7 @@ static const char *proxies_set(cmd_parms *cmd, void *internal, 
    if (!config->proxymatch_ip)

        config->proxymatch_ip = apr_array_make(cmd->pool, 1, sizeof(*match));

    match = (remoteip_proxymatch_t *) apr_array_push(config->proxymatch_ip);

    match->internal = internal;

    match->internal = cmd->info;



    if (looks_like_ip(ip)) {

        /* Note s may be null, that's fine (explicit host) */
@@ -168,7 +168,7 @@ static const char *proxies_set(cmd_parms *cmd, void *internal, 
                break;

            match = (remoteip_proxymatch_t *)

                    apr_array_push(config->proxymatch_ip);

            match->internal = internal;

            match->internal = cmd->info;

        }

    }
@@ -182,7 +182,7 @@ static const char *proxies_set(cmd_parms *cmd, void *internal, 
    return NULL;

}



static const char *proxylist_read(cmd_parms *cmd, void *internal,

static const char *proxylist_read(cmd_parms *cmd, void *cfg,

                                  const char *filename)

{

    char lbuf[MAX_STRING_LEN];
@@ -205,7 +205,7 @@ static const char *proxylist_read(cmd_parms *cmd, void *internal, 
        while (*(arg = ap_getword_conf(cmd->temp_pool, &args)) != '\0') {

            if (*arg == '#' || *arg == '\0')

                break;

            errmsg = proxies_set(cmd, internal, arg);

            errmsg = proxies_set(cmd, cfg, arg);

            if (errmsg) {

                errmsg = apr_psprintf(cmd->pool, "%s at line %d of %s",

                                      errmsg, cfp->line_number, filename);