From: Jim Jagielski Date: Thu, 1 Nov 2012 16:06:43 +0000 (+0000) Subject: Allow for setting of sticky session split char... X-Git-Tag: 2.5.0-alpha~6167 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ec40f483500b609c1e7d631753496bb3d09415b;p=thirdparty%2Fapache%2Fhttpd.git Allow for setting of sticky session split char... Bugz 53893 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1404653 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 1b7a430c3c7..664e780629f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,8 +1,11 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_proxy: Add ability to configure the sticky session separator. + PR 53893. [, Jim Jagielski] + *) mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records. - PR 40841. [Andrew Rucker Jones , + PR 40841. [Andrew Rucker Jones , , Jim Jagielski] *) ap_expr: Add req_novary function that allows HTTP header lookups diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index 56def6edd02..63b1fa7964c 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -1092,6 +1092,13 @@ ProxyPass /mirror/foo http://backend.example.com and url encoded id (like servlet containers) use | to to separate them. The first part is for the cookie the second for the path. + stickysessionsep + "." + Sets the separation symbol in the session cookie. Some backend application servers + do not use the '.' as the symbol. For example the Oracle Weblogic server uses + '!'. The correct symbol can be set using this option. The setting of 'Off' + signifies that no symbol is used. + scolonpathdelim Off If set to On the semi-colon character ';' will be diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 69e580215c8..74dab7c32a5 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -403,6 +403,7 @@ * 20120724.3 (2.5.0-dev) Add bal_persist, inherit to proxy_server_conf * 20120724.4 (2.5.0-dev) Add dirwalk_stat hook. * 20120724.5 (2.5.0-dev) Add ap_get_sload() and ap_get_loadavg(). + * 20120724.6 (2.5.0-dev) Add sticky_separator to proxy_balancer_shared struct. */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ @@ -410,7 +411,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120724 #endif -#define MODULE_MAGIC_NUMBER_MINOR 5 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index e364d5526ed..25040e738b8 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -287,6 +287,19 @@ static const char *set_balancer_param(proxy_server_conf *conf, PROXY_STRNCPY(balancer->s->sticky_path, path); } } + else if (!strcasecmp(key, "stickysessionsep")) { + /* separator/delimiter for sessionid and route, + * normally '.' + */ + if (strlen(val) != 1) { + if (!strcasecmp(val, "off")) + balancer->s->sticky_separator = 0; + else + return "stickysessionsep must be a single character or Off"; + } + else + balancer->s->sticky_separator = *val; + } else if (!strcasecmp(key, "nofailover")) { /* If set to 'on' the session will break * if the worker is in error state or diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index 9fd18d8f189..15524c64a53 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -419,6 +419,7 @@ typedef struct { int max_attempts; /* Number of attempts before failing */ int index; /* shm array index */ proxy_hashes hash; + char sticky_separator; /* separator for sessionid/route */ unsigned int sticky_force:1; /* Disable failover for sticky sessions */ unsigned int scolonsep:1; /* true if ';' seps sticky session paths */ unsigned int max_attempts_set:1; diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index dec145e5a36..78a00d3dc56 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -293,10 +293,11 @@ static proxy_worker *find_session_route(proxy_balancer *balancer, } } /* - * If we found a value for sticksession, find the first '.' within. - * Everything after '.' (if present) is our route. + * If we found a value for stickysession, find the first '.' (or whatever + * sticky_separator is set to) within. Everything after '.' (if present) + * is our route. */ - if ((*route) && ((*route = strchr(*route, '.')) != NULL )) + if ((*route) && (balancer->s->sticky_separator != 0) && ((*route = strchr(*route, balancer->s->sticky_separator)) != NULL )) (*route)++; if ((*route) && (**route)) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01161) "Found route %s", *route); diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index ce81b19e3bf..e462334f78e 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1182,6 +1182,7 @@ PROXY_DECLARE(char *) ap_proxy_define_balancer(apr_pool_t *p, (*balancer)->hash = bshared->hash; bshared->forcerecovery = 1; + bshared->sticky_separator = '.'; *bshared->nonce = PROXY_UNSET_NONCE; /* impossible valid input */ (*balancer)->s = bshared;