diff --git a/docs/manual/mod/mod_authn_socache.xml b/docs/manual/mod/mod_authn_socache.xml
index c9617a7366..9331dda6b5 100644
--- a/docs/manual/mod/mod_authn_socache.xml
+++ b/docs/manual/mod/mod_authn_socache.xml
@@ -120,7 +120,7 @@ the load on backends
This is a server-wide setting to select a provider for the
shared object cache.
- Values are "dbm", "dc", "mc", or "shmcb", each subject to the
+ Values are "dbm", "dc", "memcache", or "shmcb", each subject to the
appropriate module being loaded. If not set, your platform's
default will be used.
diff --git a/docs/manual/socache.xml b/docs/manual/socache.xml
index 9b07c681f3..8a7b7d1c0f 100644
--- a/docs/manual/socache.xml
+++ b/docs/manual/socache.xml
@@ -52,7 +52,7 @@
"dc" (mod_socache_dc)
This makes use of the distcache
distributed session caching libraries.
- "mc" (mod_socache_memcache)
+ "memcache" (mod_socache_memcache)
This makes use of the memcached
high-performance, distributed memory object caching system.
"shmcb" (mod_socache_shmcb)
diff --git a/modules/cache/mod_socache_memcache.c b/modules/cache/mod_socache_memcache.c
index 1aa8b7d311..ccb1bde766 100644
--- a/modules/cache/mod_socache_memcache.c
+++ b/modules/cache/mod_socache_memcache.c
@@ -313,7 +313,7 @@ static const ap_socache_provider_t socache_mc = {
static void register_hooks(apr_pool_t *p)
{
#ifdef HAVE_APU_MEMCACHE
- ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "mc",
+ ap_register_provider(p, AP_SOCACHE_PROVIDER_GROUP, "memcache",
AP_SOCACHE_PROVIDER_VERSION,
&socache_mc);
#endif
diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index 036e49ca5e..46e687b089 100644
--- a/modules/cluster/mod_heartmonitor.c
+++ b/modules/cluster/mod_heartmonitor.c
@@ -681,10 +681,13 @@ 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",
+ storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",
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);
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s,
+ "failed to lookup provider 'shm' for '%s', "
+ "maybe you need to load mod_slotmem_shm?",
+ AP_SLOTMEM_PROVIDER_GROUP);
return !OK;
}
storage->create(&slotmem, "mod_heartmonitor", sizeof(hm_slot_server_t), maxworkers, AP_SLOTMEM_TYPE_PREGRAB, p);
diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
index 94f23d0234..e0ff3ed5cd 100644
--- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c
+++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
@@ -371,10 +371,13 @@ 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",
+ storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",
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);
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s,
+ "Failed to lookup provider 'shm' for '%s'. Maybe you "
+ "need to load mod_slotmem_shm?",
+ AP_SLOTMEM_PROVIDER_GROUP);
return OK;
}
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 0bfa8a4ccc..1fb87f0c8e 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -716,11 +716,12 @@ 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",
+ storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",
AP_SLOTMEM_PROVIDER_VERSION);
if (!storage) {
ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(01177)
- "ap_lookup_provider %s failed: is mod_slotmem_shm loaded??",
+ "Failed to lookup provider 'shm' for '%s': is "
+ "mod_slotmem_shm loaded??",
AP_SLOTMEM_PROVIDER_GROUP);
return !OK;
}
diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index f82f63c18e..2faed759d4 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -657,7 +657,7 @@ 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",
+ ap_register_provider(p, AP_SLOTMEM_PROVIDER_GROUP, "shm",
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);