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

Changeset 1828742 is being indexed.

Merge r1822931, r1827783 from trunk:

* modules/loggers/mod_logio.c (logio_pre_config): Remove pointless

static in optional fn pointer variable declaration.

* modules/ssl/ssl_engine_vars.c (ssl_var_log_config_register):


Fix a potential compiler warning about uninitialized variable.

PR 59821

Submitted by: jorton, jailletc36

Reviewed by: jailletc36, jorton, ylavic

  1. … 3 more files in changeset.
  1. … 3 more files in changeset.
Revert r1373105, the merging of incompatible DefaultRuntimeDir


The trunk patches for these all have some configuration breakage

as 2.4.x interprets the individual directive or API parameter as

relative to ServerRoot whereas trunk interprets everything

relative to DefaultRuntimeDir.

  1. … 24 more files in changeset.
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.
Honor DefaultRuntimeDir for mutexes, socache and CGID socket.

Move away from DEFAULT_REL_RUNTIMEDIR and use

ap_runtime_dir_relative() API.

Backport of r1299718 from trunk.

Submitted by: jim

Reviwed by: rjung, trawick

Backported by: rjung

  1. … 7 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.