From 7eb1caed9a4f9ac52f0cd59dda3c1df2a68d39e1 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Thu, 14 Jul 2011 14:47:59 +0000 Subject: [PATCH] fix def'n of AP_SLOTMEM_PROVIDER_VERSION, use it git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146737 13f79535-47bb-0310-9956-ffa450edef68 --- include/ap_slotmem.h | 2 +- modules/cluster/mod_heartmonitor.c | 3 ++- modules/proxy/balancers/mod_lbmethod_heartbeat.c | 3 ++- modules/proxy/mod_proxy_balancer.c | 3 ++- modules/slotmem/mod_slotmem_plain.c | 3 ++- modules/slotmem/mod_slotmem_shm.c | 3 ++- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/ap_slotmem.h b/include/ap_slotmem.h index 9f7db23a5c5..81fde88a2aa 100644 --- a/include/ap_slotmem.h +++ b/include/ap_slotmem.h @@ -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; diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c index f2240c66f22..1ec1dc803c3 100644 --- a/modules/cluster/mod_heartmonitor.c +++ b/modules/cluster/mod_heartmonitor.c @@ -683,7 +683,8 @@ static int hm_post_config(apr_pool_t *p, apr_pool_t *plog, 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; diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c index 11d28f41a27..e8dbbc122a9 100644 --- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c +++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c @@ -396,7 +396,8 @@ static int lb_hb_init(apr_pool_t *p, apr_pool_t *plog, 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; diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index 8123cfaafb4..aa2de4162a1 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -703,7 +703,8 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog, /* * 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??", diff --git a/modules/slotmem/mod_slotmem_plain.c b/modules/slotmem/mod_slotmem_plain.c index 2bf832922f7..0a6bccb50b2 100644 --- a/modules/slotmem/mod_slotmem_plain.c +++ b/modules/slotmem/mod_slotmem_plain.c @@ -300,7 +300,8 @@ static int pre_config(apr_pool_t *p, apr_pool_t *plog, 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); } diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c index 67736bac306..f82f63c18eb 100644 --- a/modules/slotmem/mod_slotmem_shm.c +++ b/modules/slotmem/mod_slotmem_shm.c @@ -657,7 +657,8 @@ static int pre_config(apr_pool_t *p, apr_pool_t *plog, 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); } -- 2.47.2