www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

fix def'n of AP_SLOTMEM_PROVIDER_VERSION, use it

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146737 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeff Trawick
2011-07-14 14:47:59 +00:00
parent df11af1bae
commit 7eb1caed9a
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ap_slotmem.h
View File

@@ -49,7 +49,7 @@ extern "C" {
#endif #endif
#define AP_SLOTMEM_PROVIDER_GROUP "slotmem" #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; typedef unsigned int ap_slotmem_type_t;

3
modules/cluster/mod_heartmonitor.c
View File

@@ -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) { if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_CONFIG) {
/* this is the real thing */ /* this is the real thing */
if (maxworkers) { 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) { if (!storage) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, "ap_lookup_provider %s failed", AP_SLOTMEM_PROVIDER_GROUP); ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, "ap_lookup_provider %s failed", AP_SLOTMEM_PROVIDER_GROUP);
return !OK; return !OK;

3
modules/proxy/balancers/mod_lbmethod_heartbeat.c
View File

@@ -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) if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)
return OK; 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) { if (!storage) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "ap_lookup_provider %s failed", AP_SLOTMEM_PROVIDER_GROUP); ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "ap_lookup_provider %s failed", AP_SLOTMEM_PROVIDER_GROUP);
return OK; return OK;

3
modules/proxy/mod_proxy_balancer.c
View File

@@ -703,7 +703,8 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog,
/* /*
* Get slotmem setups * 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) { if (!storage) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s,
"ap_lookup_provider %s failed: is mod_slotmem_shm loaded??", "ap_lookup_provider %s failed: is mod_slotmem_shm loaded??",

3
modules/slotmem/mod_slotmem_plain.c
View File

@@ -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) static void ap_slotmem_plain_register_hook(apr_pool_t *p)
{ {
/* XXX: static const char * const prePos[] = { "mod_slotmem.c", NULL }; */ /* 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); ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
} }

3
modules/slotmem/mod_slotmem_shm.c
View File

@@ -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) static void ap_slotmem_shm_register_hook(apr_pool_t *p)
{ {
const ap_slotmem_provider_t *storage = slotmem_shm_getstorage(); 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_post_config(post_config, NULL, NULL, APR_HOOK_LAST);
ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE); ap_hook_pre_config(pre_config, NULL, NULL, APR_HOOK_MIDDLE);
} }