You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2011/12/04 22:07:59 UTC
svn commit: r1210224 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/
docs/manual/mod/ modules/cache/ modules/cluster/ modules/proxy/
modules/proxy/balancers/ modules/slotmem/
Author: sf
Date: Sun Dec 4 21:07:58 2011
New Revision: 1210224
URL: http://svn.apache.org/viewvc?rev=1210224&view=rev
Log:
Merge r1210221:
Change the provider names to match the module names:
mod_slotmem_shm: shared -> shm
mod_socache_memcache: mc -> memcache
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_socache.xml
httpd/httpd/branches/2.4.x/docs/manual/socache.xml
httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c
httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c
httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 4 21:07:58 2011
@@ -1,3 +1,3 @@
/httpd/httpd/branches/revert-ap-ldap:1150158-1150173
/httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_socache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_socache.xml?rev=1210224&r1=1210223&r2=1210224&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_socache.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_authn_socache.xml Sun Dec 4 21:07:58 2011
@@ -120,7 +120,7 @@ the load on backends</description>
<usage>
<p>This is a server-wide setting to select a provider for the
<a href="../socache.html">shared object cache</a>.
- 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.</p>
</usage>
Modified: httpd/httpd/branches/2.4.x/docs/manual/socache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/socache.xml?rev=1210224&r1=1210223&r2=1210224&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/socache.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/socache.xml Sun Dec 4 21:07:58 2011
@@ -52,7 +52,7 @@
<dt>"dc" (mod_socache_dc)</dt>
<dd>This makes use of the <a href="http://www.distcache.org/">distcache</a>
distributed session caching libraries.</dd>
- <dt>"mc" (mod_socache_memcache)</dt>
+ <dt>"memcache" (mod_socache_memcache)</dt>
<dd>This makes use of the <a href="http://memcached.org/">memcached</a>
high-performance, distributed memory object caching system.</dd>
<dt>"shmcb" (mod_socache_shmcb)</dt>
Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c?rev=1210224&r1=1210223&r2=1210224&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_socache_memcache.c Sun Dec 4 21:07:58 2011
@@ -313,7 +313,7 @@ static const ap_socache_provider_t socac
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
Modified: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c?rev=1210224&r1=1210223&r2=1210224&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c Sun Dec 4 21:07:58 2011
@@ -681,10 +681,13 @@ 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",
+ 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);
Modified: httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1210224&r1=1210223&r2=1210224&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/balancers/mod_lbmethod_heartbeat.c Sun Dec 4 21:07:58 2011
@@ -371,10 +371,13 @@ 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",
+ 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;
}
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c?rev=1210224&r1=1210223&r2=1210224&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c Sun Dec 4 21:07:58 2011
@@ -716,11 +716,12 @@ static int balancer_post_config(apr_pool
/*
* 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,
- "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;
}
Modified: httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c?rev=1210224&r1=1210223&r2=1210224&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c (original)
+++ httpd/httpd/branches/2.4.x/modules/slotmem/mod_slotmem_shm.c Sun Dec 4 21:07:58 2011
@@ -657,7 +657,7 @@ 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",
+ 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);