35 Commits

Author SHA1 Message Date
b72da39d62 Add log tags.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1891023 13f79535-47bb-0310-9956-ffa450edef68
2021-06-24 14:17:02 +00:00
95592b5dda dbm: Split the loading of a dbm driver from the opening of a dbm file. When
an attempt to load a dbm driver fails, log clearly which driver triggered
the error (not "default"), and what the error was.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1891019 13f79535-47bb-0310-9956-ffa450edef68
2021-06-24 10:27:49 +00:00
f461bcf12c Add missing pool tags to help debugging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876599 13f79535-47bb-0310-9956-ffa450edef68
2020-04-16 12:32:33 +00:00
f3de5dcfe6 Remove some useless 'return' statements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715567 13f79535-47bb-0310-9956-ffa450edef68
2015-11-21 20:42:39 +00:00
0c12000aed Add output for "?auto" version of server-status
to proxy status, mod_ssl session cache info,
mod_cache_socache and the status hook of the
individual socache implementations.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671397 13f79535-47bb-0310-9956-ffa450edef68
2015-04-05 13:54:22 +00:00
a9896837af mod_socache_shmcb and mod_socache_dbm: finish support of
DefaultRuntimeDir

a partial conversion was made in r1299718, affecting cases
where no filename was specified


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1370225 13f79535-47bb-0310-9956-ffa450edef68
2012-08-07 12:44:30 +00:00
5caa336986 Move away from DEFAULT_REL_RUNTIMEDIR and use ap_runtime_dir_relative()
API

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1299718 13f79535-47bb-0310-9956-ffa450edef68
2012-03-12 15:45:03 +00:00
92e366007c Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 23:02:04 +00:00
862faade75 Fixed compilation for non-*nix platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208527 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 17:16:09 +00:00
3c0136afce Fix some warn_unused_result compiler warnings by checking the return code of
chown and logging an error if the error was not ENOENT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206827 13f79535-47bb-0310-9956-ffa450edef68
2011-11-27 20:26:49 +00:00
427c85bd23 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +00:00
01ed21af9d Add wrappers for malloc, calloc, realloc that check for out of memory
situations.  Use them in most places where malloc, and friends are used.
This results in clean error messages in an out of memory situation instead of
segfaulting or silently malfunctioning. In some places, it just allows to
remove some logging code.

PR 51568, PR 51569, PR 51571.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1172686 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 16:25:42 +00:00
ddf06604b5 enable DEFAULT_REL_RUNTIMEDIR on NetWare and Windows
this commit is missing the Windows and NetWare build
logic to copy the appropriate file to include/ap_config_layout.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086073 13f79535-47bb-0310-9956-ffa450edef68
2011-03-27 23:51:18 +00:00
2fc7e07cb1 Clean iterator call syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@960075 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 18:02:51 +00:00
de541c9184 Fix nasty dbm bug that wasn't expiring records; time() doesn't return apr_time_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@960074 13f79535-47bb-0310-9956-ffa450edef68
2010-07-02 18:02:27 +00:00
5740b5cfd9 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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@958157 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 00:26:01 +00:00
6782a1f9fe Iterator implementations welcome, although mod_socache_memcache will
never gain one, per documentation in the memcached FAQ.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@958093 13f79535-47bb-0310-9956-ffa450edef68
2010-06-25 19:22:48 +00:00
f877509b61 Fix return values from socache modules when a key is not found in cache
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@957235 13f79535-47bb-0310-9956-ffa450edef68
2010-06-23 15:04:57 +00:00
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
f90bc4f900 Align "hidden" function names with external... picky, but
less confusing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@923791 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 15:01:55 +00:00
2052575a36 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’


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@918655 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 19:32:58 +00:00
7dea349012 fix additional use of "session" terminology, following r907917
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@908168 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 19:34:51 +00:00
3cc4b9db61 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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907917 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 03:43:18 +00:00
e1286998c4 * 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757396 13f79535-47bb-0310-9956-ffa450edef68
2009-03-23 13:18:06 +00:00
7266c515bb ditto hack from mpm_default.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728787 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 21:34:59 +00:00
aa062c60f3 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726059 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 15:56:15 +00:00
dce91079c1 Reduce config overhead for use of socache interface by allowing
default paths to be used if none are configured:

* include/ap_socache.h (ap_socache_provider_t::create):
  Allow arg to be NULL to force use of defaults.
  (ap_socache_provider_t::init): Rename 'namespace' parameter to
  'cname' and restrict to allow use in filesystem paths.
  
* modules/cache/mod_socache_dbm.c (socache_dbm_create, 
  socache_dbm_init),
  modules/cache/mod_socache_shmcb.c (socache_shmcb_create, 
  socache_shmcb_init): 
  Default to use of runtimedir-relative paths if no
  explicit path is configured.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724682 13f79535-47bb-0310-9956-ffa450edef68
2008-12-09 13:11:45 +00:00
a73acf02f6 API Cleanup in preperation for 2.4.x, make sure all exported functions or variables contain an ap_ prefix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722399 13f79535-47bb-0310-9956-ffa450edef68
2008-12-02 08:13:36 +00:00
e1e0efeac8 * modules/cache/mod_socache_dbm.c
(socache_dbm_init) Use AP_NEED_SET_MUTEX_PERMS to determine when we need to
    set the file permissions on the created DBM files, rather than listing 
    a hodgepodge of operating systems by hand.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@708067 13f79535-47bb-0310-9956-ffa450edef68
2008-10-27 00:43:45 +00:00
409a8921e3 * modules/cache/mod_socache_dbm.c: Fix compile by including unixd.h on operating
systems that need it, which is required for for the use of unixd_config
    inside socache_dbm_init.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@708066 13f79535-47bb-0310-9956-ffa450edef68
2008-10-27 00:40:36 +00:00
719bf72489 remove const on socache module declarations to avoid segfault in
ap_setup_prelinked_modules() when modules linked in at compile time


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@648499 13f79535-47bb-0310-9956-ffa450edef68
2008-04-16 04:02:57 +00:00
bd632a3388 * modules/cache/mod_socache_dbm.c: Fix some dodgy formatting, thanks rpluem.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645984 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 16:04:12 +00:00
2e2731f3f9 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645978 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 15:47:48 +00:00
39bb462ea8 * 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645924 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 13:49:52 +00:00
3279936028 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645844 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 10:47:04 +00:00