Checkout Tools
  • last updated 24 mins ago
Constraints: committers
Constraints: files
Constraints: dates
Merge r1858565 from trunk:

* modules/cache/mod_socache_shmcb.c (socache_shmcb_init): Describe

error better for anon shm failure case, fixing gcc 9 warning on

passing NULL for '%s'.

Reviewed by: jorton, icing, jim

  1. … 1 more file in changeset.
Fix missing limits.h header, required for release,

masked on many platforms by intrinsic limits.h inclusion by

other headers.

Backports: r1736243

  1. … 1 more file in changeset.
Merge r1671397, r1672466, r1672564 from trunk:

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.

Followon to r1671397 for proxy server-status

in auto mode:

- don't show HTML legend

- Show correct worker name

More followon to r1671397 for proxy server-status

in auto mode:

- remove remaining HTML markup

Submitted by: rjung

Reviewed/backported by: jim

  1. … 8 more files in changeset.
Merge r1595426 from trunk:

mod_socache_shmcb: Correct counting of expirations for status display.

Expirations happening during retrieval were not counted.

Submitted by: rjung

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1493921, r1515162 from trunk:

mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size

previously limited to 64MB.

Limit SHMCB_MAX_SIZE to min(UINT_MAX, APR_SIZE_MAX) to match the current code

Submitted by: minfrin, sf

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Multiple backports from trunk:

- rotatelog: Factor out from doRotate, main; make error handling consistant

and print the actual error to stderr

PR 45084

Backport of r1374247 from trunk.

- rotatelog: Cleanups, no functional change. Drop revision history,

"svn log" works; use APR_PATH_MAX; constify more

Backport of r1409800 from trunk.

- rotatelog: error[120] is already defined in this function. Just use

it instead of shadowing.

Backport of r1416121 from trunk.

- rotatelog: Use apr_snprintf(... "%pm"...) instead of explicit call

to apr_strerror

Backport of r1463736 from trunk.

- mod_deflate: style fix (no code change)

Backport of r1499679 from trunk.

- mod_socache_shmcb: Correct the use of the printf formatter.

Backport of r1493925 from trunk.

- mod_cache_socache: Fixed signed<->unsigned compiler warning.

Backport of r1490550 from trunk.

- mod_ssl: add missing space between directive description and syntax

Backport of r1509983 from trunk.

- mpm/winnt: style consistency in winnt's worker_main

Backport of r1520760 from trunk.

Proposed by: jailletc36

Reviewed by: jim, rjung

  1. … 7 more files in changeset.
Fix bus error in mod_socache_shmcb due to a misalignment

in some 32 bit builds, especially on Solaris Sparc.

PR 53040.

Backport of r1373270 from trunk.

Submitted by: rjung

Reviewed by: rpluem, trawick

  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.