Commit b4a6c05c authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1824176, r1824460, r1824482 from trunk: 

mod_proxy: Provide an RFC1035 compliant version of the hostname in the
proxy_worker_shared structure. PR62085


Tone down the message that worker hostname is too long noting it only
affects legacy modules not yet using hostname_ex.


Set the notice when hostname is too long for legacy proxy modules to info level.


Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic


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

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.4.30



  *) mod_proxy: Provide an RFC1035 compliant version of the hostname in the

     proxy_worker_shared structure. PR62085 [Graham Leggett]



  *) mod_session: Strip Session header when SessionEnv is on.  [Yann Ylavic]



  *) mod_cache_socache: Fix caching of empty headers up to carriage return.

include/ap_mmn.h

+4 −3
Original line number Diff line number Diff line
@@ -510,6 +510,7 @@ 
 * 20120211.74 (2.4.30-dev) Add AP_REG_DOLLAR_ENDONLY, ap_regcomp_get_default_cflags

 *                          ap_regcomp_set_default_cflags and

 *                          ap_regcomp_default_cflag_by_name

 * 20120211.75 (2.4.30-dev) Add hostname_ex to proxy_worker_shared

 */



#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -517,7 +518,7 @@ 
#ifndef MODULE_MAGIC_NUMBER_MAJOR

#define MODULE_MAGIC_NUMBER_MAJOR 20120211

#endif

#define MODULE_MAGIC_NUMBER_MINOR 74                  /* 0...n */

#define MODULE_MAGIC_NUMBER_MINOR 75                  /* 0...n */



/**

 * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

modules/proxy/balancers/mod_lbmethod_heartbeat.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static proxy_worker *find_best_hb(proxy_balancer *balancer, 


    for (i = 0; i < balancer->workers->nelts; i++) {

        worker = &APR_ARRAY_IDX(balancer->workers, i, proxy_worker *);

        server = apr_hash_get(servers, (*worker)->s->hostname, APR_HASH_KEY_STRING);

        server = apr_hash_get(servers, (*worker)->s->hostname_ex, APR_HASH_KEY_STRING);



        if (!server) {

            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv, r, APLOGNO(01214)

modules/proxy/mod_proxy.c

+5 −3
Original line number Diff line number Diff line
@@ -2838,7 +2838,7 @@ static int proxy_status_hook(request_rec *r, int flags) 
            char fbuf[50];

            if (!(flags & AP_STATUS_SHORT)) {

                ap_rvputs(r, "<tr>\n<td>", (*worker)->s->scheme, "</td>", NULL);

                ap_rvputs(r, "<td>", (*worker)->s->hostname, "</td><td>", NULL);

                ap_rvputs(r, "<td>", (*worker)->s->hostname_ex, "</td><td>", NULL);

                ap_rvputs(r, ap_proxy_parse_wstatus(r->pool, *worker), NULL);

                ap_rvputs(r, "</td><td>", (*worker)->s->route, NULL);

                ap_rvputs(r, "</td><td>", (*worker)->s->redirect, NULL);
@@ -2930,7 +2930,8 @@ static void child_init(apr_pool_t *p, server_rec *s) 
            ap_proxy_define_worker(p, &forward, NULL, NULL, "http://www.apache.org", 0);

            conf->forward = forward;

            PROXY_STRNCPY(conf->forward->s->name,     "proxy:forward");

            PROXY_STRNCPY(conf->forward->s->hostname, "*");

            PROXY_STRNCPY(conf->forward->s->hostname, "*"); /* for compatibility */

            PROXY_STRNCPY(conf->forward->s->hostname_ex, "*");

            PROXY_STRNCPY(conf->forward->s->scheme,   "*");

            conf->forward->hash.def = conf->forward->s->hash.def =

                ap_proxy_hashfunc(conf->forward->s->name, PROXY_HASHFUNC_DEFAULT);
@@ -2947,7 +2948,8 @@ static void child_init(apr_pool_t *p, server_rec *s) 
        if (!reverse) {

            ap_proxy_define_worker(p, &reverse, NULL, NULL, "http://www.apache.org", 0);

            PROXY_STRNCPY(reverse->s->name,     "proxy:reverse");

            PROXY_STRNCPY(reverse->s->hostname, "*");

            PROXY_STRNCPY(reverse->s->hostname, "*"); /* for compatibility */

            PROXY_STRNCPY(reverse->s->hostname_ex, "*");

            PROXY_STRNCPY(reverse->s->scheme,   "*");

            reverse->hash.def = reverse->s->hash.def =

                ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_DEFAULT);

modules/proxy/mod_proxy.h

+4 −1
Original line number Diff line number Diff line
@@ -354,6 +354,8 @@ PROXY_WORKER_HC_FAIL ) 
#define PROXY_BALANCER_MAX_HOSTNAME_SIZE PROXY_WORKER_MAX_HOSTNAME_SIZE

#define PROXY_BALANCER_MAX_STICKY_SIZE  64



#define PROXY_RFC1035_HOSTNAME_SIZE	256



/* RFC-1035 mentions limits of 255 for host-names and 253 for domain-names,

 * dotted together(?) this would fit the below size (+ trailing NUL).

 */
@@ -384,7 +386,7 @@ typedef struct { 
typedef struct {

    char      name[PROXY_WORKER_MAX_NAME_SIZE];

    char      scheme[PROXY_WORKER_MAX_SCHEME_SIZE];   /* scheme to use ajp|http|https */

    char      hostname[PROXY_WORKER_MAX_HOSTNAME_SIZE];  /* remote backend address */

    char      hostname[PROXY_WORKER_MAX_HOSTNAME_SIZE];  /* remote backend address (deprecated, use hostname_ex below) */

    char      route[PROXY_WORKER_MAX_ROUTE_SIZE];     /* balancing route */

    char      redirect[PROXY_WORKER_MAX_ROUTE_SIZE];  /* temporary balancing redirection route */

    char      flusher[PROXY_WORKER_MAX_SCHEME_SIZE];  /* flush provider used by mod_proxy_fdpass */
@@ -444,6 +446,7 @@ typedef struct { 
    hcmethod_t      method;     /* method to use for health check */

    apr_interval_time_t interval;

    char      upgrade[PROXY_WORKER_MAX_SCHEME_SIZE];/* upgrade protocol used by mod_proxy_wstunnel */

    char      hostname_ex[PROXY_RFC1035_HOSTNAME_SIZE];  /* RFC1035 compliant version of the remote backend address */

} proxy_worker_shared;



#define ALIGNED_PROXY_WORKER_SHARED_SIZE (APR_ALIGN_DEFAULT(sizeof(proxy_worker_shared)))