* modules/cache/mod_socache_memcache.c (socache_mc_store): Pass through expiration time. Submitted by: Faidon Liambotis <paravoid debian.org>, jorton

Fix some compiler warnings.

According top my testing 'socache_mc_id2key' is 6x faster with the use 'ap_bin2hex' instead of apr_snprintf(..., "%02X" for each character. Output is *not* exactly the same. It was uppercase, now it is lowercase. According to my understanding, this is not an issue. Should it be, a call to ap_str_toupper should be added. The speedup would be less, but still significant.

Change the provider names to match the module names: mod_slotmem_shm: shared -> shm mod_socache_memcache: mc -> memcache

Add lots of unique tags to error log messages

Remove more log message prefixes that are now redundant as the the error log format includes the module name.

Cleanup effort in prep for GA push: Trim trailing whitespace... no func change

Introduce an socache iterator 'userctx' for the user to track the context of their own callback. Breaks API, but we probably wanted an mmn reset between .6 and .7 betas for unintentional/unnoticed ABI breaks.

Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take advantage of per-module loglevels

Align "hidden" function names with external... picky, but less confusing

fix these warnings (and presumably a similar one in mod_socache_dc.c): mod_socache_shmcb.c:625: warning: no previous prototype for ‘socache_shmcb_iterate’ mod_socache_dbm.c:505: warning: no previous prototype for ‘socache_dbm_iterate’ mod_socache_memcache.c:290: warning: no previous prototype for ‘socache_mc_iterate’

distcache already demonstrates sub-second resolutions, but much more importantly, let us not introduce more Y2k38 bugs? Changes the ->store method to take expiry as an apr_time_t, and introduce a placeholder to implement provider-specific iterators of the current elements of an socache store. Cleans up confusion where expiry might be confused with a timeout-period. Finally clean up some hUngarian noteAtion. Someones' hands need to be slapped.

* modules/cache/mod_socache_memcache.c, modules/cache/mod_socache_shmcb.c, modules/cache/mod_socache_dbm.c: Remove references to "SSL" throughout comments and code.

socache API tweaks based on chrisd's review: * include/ap_socache.h (ap_socache_provider_t::store): Take a pool. (ap_socache_provider_t::retrieve): Guarantee APR_NOTFOUND for a "not found" result. (ap_socache_provider_t::remove): Return an apr_status_t. * modules/cache/mod_socache_dc.c, modules/cache/mod_socache_dbm.c, modules/cache/mod_socache_shmcb, modules/cache/mod_socache_memcache.c: Adjust accordingly. * modules/ssl/ssl_scache.c (ssl_scache_store): Pass pool to sesscache->store.

* modules/cache/mod_socache_memcache.c (socache_mc_init): Remove references to SSL in log messages. (socache_mc_retrieve): Use 'data' not 'der'; correctly return an error for the overflow case.

* modules/cache/mod_socache_memcache.c (socache_mc_create): Fail if no argument is given. (socache_mc_init): Increment the taglen field. (socache_mc_id2key): Renamed from mc_session_id2sz and catch key name overflow, per rpluem's review. (socache_mc_store, socache_mc_retrieve, socache_mc_remove): Adjust for new id2key interface.

Signedness error

remove const on socache module declarations to avoid segfault in ap_setup_prelinked_modules() when modules linked in at compile time

Adjust socache init interface to take sizing hints, and namespace tag for memcache: * modules/cache/ap_socache.h (struct ap_socache_hints): New structure. Change init callback to take namespace string and hints structure pointer. * modules/cache/mod_socache_dc.c (socache_dc_init): Adjust accordingly. * modules/cache/mod_socache_dbm.c (struct ap_socache_instance_t): Rename timeout field to expiry_interval. (socache_dbm_init, socache_dbm_create): Take expiry interval from hints rather than hard-code to 30. (socache_dbm_expire): Update for timeout field rename. * modules/cache/mod_socache_shmcb.c (socache_shmcb_init): Adjust for hints and namespace; adjust subcache index sizing heuristics to use passed-in hints. * modules/cache/mod_socache_memcache.c (struct ap_socache_instance_t): Add tag, taglen fields. (socache_mc_init): Store the passed-in namespace in instance structure. (mc_session_id2sz): Adjust to not take context, use configured tag as string prefix, and not use a return value. (socache_mc_store, socache_mc_retrieve, socache_mc_remove): Adjust for mc_session_id2sz interface changes. * modules/ssl/ssl_scache.c (ssl_scache_init): Pass namespace and hints to socache provider init function.

* modules/cache/ap_socache.h: Add ap_socache_instance_t object type. Adjust the provider interface to use this instance type throughout. * modules/cache/mod_socache_dbm.c, modules/cache/mod_socache_memcache.c, modules/cache/mod_socache_shmcb.c, modules/cache/mod_socache_dc.c: Adjust all implementations to define the instance object in place of the "struct context", and to take this object directly in the provider interface.

Session cache interface redesign, Part 8: Abstract out the mod_ssl session caching interface into a separate set of modules, mod_socache_*. * modules/cache/ap_socache.h: New file. * modules/cache/config.m4: Copy CHECK_DISTCACHE from ../ssl/config.m4; add new socache modules. * modules/cache/mod_socache_dbm.c: Copied from ../ssl/ssl_scache_dbm.c. s/ssl_scache_/socache_/; add module structure and register_hooks. * modules/cache/mod_socache_shmcb.c: Copied from ../ssl/ssl_scache_shmcb.c. s/ssl_scache_/socache_/; add module structure and register_hooks. Add SHMCB_MAX_SIZE definition, replacing APR_SHM_MAXSIZE. * modules/cache/mod_socache_memcache.c: Copied from ../ssl/ssl_scache_memcache.c. s/ssl_scache_/socache_/; add module structure and register_hooks. Enable for APR-Util 1.3.x at compile-time, omitting configure-time checks. * modules/cache/mod_socache_dc.c: Copied from ../ssl/ssl_scache_dc.c. s/ssl_scache_/socache_/; add module structure and register_hooks.