Checkout Tools
  • last updated 7 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1373105 is being indexed.

Merge r1364695, r1369477, r1369808, r1370288, r1370225, r1370763, r1371684 from trunk:

mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/

DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.

core: Respect DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR for the

scoreboard (ScoreBoardFile).

The Pidfile directive and ap_log_pid()/ap_remove_pid()/ap_read_pid()

now respect DefaultRuntimeDir

Mutex directive: finish support of DefaultRuntimeDir

a partial conversion was made in r1299718, but I'm not

sure when that change is effective

mod_socache_shmcb and mod_socache_dbm: finish support of


a partial conversion was made in r1299718, affecting cases

where no filename was specified

mod_slotmem_plain: make the "filename" key relative to

DefaultRuntimeDir if not absolute

mod_slotmem_plain does not externalize or check the full path

in any way, so this change is just for consistency with other

modules which build paths to run-time artifacts.

make LDAPSharedCacheFile relative to DefaultRuntimeDir

Submitted by: trawick

Reviewed/backported by: jim

  1. … 24 more files in changeset.
Merge r1303201, r1303435, r1303827:

* Revert r1294936 (Jeff's revert) and fix NetWare / Win32 build.

Added the missing AP_DECLARE* decorations for the function

implementations and variables.

* Fix changes in parameter names in function definitions done in r1303201

* Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing

the global variable with the same name and create a bogus assignment.

Pointed out by: Eric Covener

Committed by: fuankg, rpluem

Reviewed by: fuankg, minfrin, trawick

  1. … 7 more files in changeset.
Align 2.4 w/ trunk... since 2.4.0 was never released, API change is OK.

  1. … 2 more files in changeset.