Commit 32284517 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Change the provider names to match the module names: 

mod_slotmem_shm: shared -> shm
mod_socache_memcache: mc -> memcache


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210221 13f79535-47bb-0310-9956-ffa450edef68
parent 008c31f3

docs/manual/mod/mod_authn_socache.xml

+1 −1
Changes for docs/manual/mod/mod_authn_socache.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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>

docs/manual/socache.xml

+1 −1
Changes for docs/manual/socache.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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>

modules/cache/mod_socache_memcache.c

+1 −1
Changes for modules/cache/mod_socache_memcache.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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

modules/cluster/mod_heartmonitor.c

+5 −2
Changes for modules/cluster/mod_heartmonitor.c: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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);

modules/proxy/balancers/mod_lbmethod_heartbeat.c

+5 −2
Changes for modules/proxy/balancers/mod_lbmethod_heartbeat.c: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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;

    }