[jbossnative-commits] JBoss Native SVN: r2344 - trunk/mod_cluster/native/mod_proxy_cluster.

Author: jfrederic.clere(a)jboss.com Date: 2009-03-07 08:15:52 -0500 (Sat, 07 Mar 2009) New Revision: 2344 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: Oops should be done after manager_init(). Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-03-07 11:46:26 UTC (rev 2343) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-03-07 13:15:52 UTC (rev 2344) @@ -1293,7 +1293,16 @@ static int proxy_cluster_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) { + const char *userdata_key = "mod_cluster_init"; + void *data; + apr_pool_userdata_get(&data, userdata_key, s->process->pool); + if (data && sessionid_storage) { + int nb_sessionid = sessionid_storage->get_max_size_sessionid(); + if (! nb_sessionid) + sessionid_storage = NULL; /* don't use it */ + } + /* Check that the mod_proxy_balancer.c is not loaded */ if (ap_find_linked_module("mod_proxy_balancer.c") != NULL) { ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, @@ -1331,10 +1340,6 @@ ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s, "proxy_cluster_post_config: Can't find mod_manager for sessionids"); return !OK; - } else { - int nb_sessionid = sessionid_storage->get_max_size_sessionid(); - if (! nb_sessionid) - sessionid_storage = NULL; /* don't use it */ } return OK;