You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2011/07/14 16:47:59 UTC
svn commit: r1146737 - in /httpd/httpd/trunk: include/ap_slotmem.h
modules/cluster/mod_heartmonitor.c
modules/proxy/balancers/mod_lbmethod_heartbeat.c
modules/proxy/mod_proxy_balancer.c modules/slotmem/mod_slotmem_plain.c
modules/slotmem/mod_slotmem_shm.c
Author: trawick
Date: Thu Jul 14 14:47:59 2011
New Revision: 1146737
URL: http://svn.apache.org/viewvc?rev=1146737&view=rev
Log:
fix def'n of AP_SLOTMEM_PROVIDER_VERSION, use it
Modified:
httpd/httpd/trunk/include/ap_slotmem.h
httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
Modified: httpd/httpd/trunk/include/ap_slotmem.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_slotmem.h?rev=1146737&r1=1146736&r2=1146737&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_slotmem.h (original)
+++ httpd/httpd/trunk/include/ap_slotmem.h Thu Jul 14 14:47:59 2011
@@ -49,7 +49,7 @@ extern "C" {
#endif
#define AP_SLOTMEM_PROVIDER_GROUP "slotmem"
-#define AP_SLOTMEM_PROVIDER_VERSION 0
+#define AP_SLOTMEM_PROVIDER_VERSION "0"
typedef unsigned int ap_slotmem_type_t;
Modified: httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c?rev=1146737&r1=1146736&r2=1146737&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/trunk/modules/cluster/mod_heartmonitor.c Thu Jul 14 14:47:59 2011
@@ -683,7 +683,8 @@ static int hm_post_config(apr_pool_t *p,
if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_CONFIG) {
/* this is the real thing */
if (maxworkers) {
- storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shared", "0");
+ storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shared",
+ AP_SLOTMEM_PROVIDER_VERSION);
if (!storage) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, "ap_lookup_provider %s failed", AP_SLOTMEM_PROVIDER_GROUP);
return !OK;
Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1146737&r1=1146736&r2=1146737&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c Thu Jul 14 14:47:59 2011
@@ -396,7 +396,8 @@ static int lb_hb_init(apr_pool_t *p, apr
if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)
return OK;
- storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shared", "0");
+ storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shared",
+ AP_SLOTMEM_PROVIDER_VERSION);
if (!storage) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "ap_lookup_provider %s failed", AP_SLOTMEM_PROVIDER_GROUP);
return OK;
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1146737&r1=1146736&r2=1146737&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Thu Jul 14 14:47:59 2011
@@ -703,7 +703,8 @@ static int balancer_post_config(apr_pool
/*
* Get slotmem setups
*/
- storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shared", "0");
+ storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shared",
+ AP_SLOTMEM_PROVIDER_VERSION);
if (!storage) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s,
"ap_lookup_provider %s failed: is mod_slotmem_shm loaded??",
Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c?rev=1146737&r1=1146736&r2=1146737&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_plain.c Thu Jul 14 14:47:59 2011
@@ -300,7 +300,8 @@ static int pre_config(apr_pool_t *p, apr
static void ap_slotmem_plain_register_hook(apr_pool_t *p)
{
/* XXX: static const char * const prePos[] = { "mod_slotmem.c", NULL }; */
- ap_register_provider(p, AP_SLOTMEM_PROVIDER_GROUP, "plain", "0", &storage);
+ ap_register_provider(p, AP_SLOTMEM_PROVIDER_GROUP, "plain",
+ AP_SLOTMEM_PROVIDER_VERSION, &storage);
ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
}
Modified: httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c?rev=1146737&r1=1146736&r2=1146737&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/trunk/modules/slotmem/mod_slotmem_shm.c Thu Jul 14 14:47:59 2011
@@ -657,7 +657,8 @@ static int pre_config(apr_pool_t *p, apr
static void ap_slotmem_shm_register_hook(apr_pool_t *p)
{
const ap_slotmem_provider_t *storage = slotmem_shm_getstorage();
- ap_register_provider(p, AP_SLOTMEM_PROVIDER_GROUP, "shared", "0", storage);
+ ap_register_provider(p, AP_SLOTMEM_PROVIDER_GROUP, "shared",
+ AP_SLOTMEM_PROVIDER_VERSION, storage);
ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_LAST);
ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
}