Checkout Tools
  • last updated 4 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merge r1809881, r1809973, r1809976, r1812075 from trunk:

core: deregister all hooks before leaving pconf, otherwise some late cleanup

or function call (e.g. ap_log) may use one while DSOs are unloaded.

See PR 61558 (double/second fault).

core, MPMs unix: follow up to r1809881.

Deregister all hooks first (in pre_cleanup), by doing it last we could still

have had them run when DSOs were unloaded.

Likewise, avoid double faults when handling fatal signals by restoring the

default handler before pconf is cleared (we can't ap_log_error there).

Finally, we need to ignore sig_term/restart (do nothing) when the main

process is exiting (i.e. ap_pglobal is destroyed), since retained_data are


Aimed to fix all faults in PR 61558.

MPMs unix: follow up to r1809881 and r1809973.

unset_signals() is called when ap_pglobal is destroyed too.

Follow up to r1809881: CHANGES entry.

Submitted by: ylavic

Reviewed by: ylavic, jim, covener

  1. … 7 more files in changeset.
Merge r1783849 from trunk:

MPMs unix: Place signals handlers and helpers out of DSOs to avoid

a possible crash if a signal is caught during (graceful) restart.

PR 60487.

Reviewedby: ylavic, wrowe, icing

  1. … 8 more files in changeset.
Merge r1757061, r1770750 from trunk:

ap_reclaim_child_processes() ignores its first argument

note this in the docs, add comment

ap_reclaim_child_processes(): Implement terminate immediately

The behavior for terminate == 1 was documented but not implemented. Do

that now.

Submitted by: sf

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Merge r1766160 from trunk:

mpm_unix: Apache fails to start if previously crashed then restarted with

the same PID (e.g. in container). PR 60261.

Proposed by: Val <valentin.bremond>

Reviewed by: ylavic

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 3 more files in changeset.
number format

Merge r1542379 from trunk:

PR: 54852. Only use a dummy_connection for idle processes

Reviewed/backported by: jim

  1. … 3 more files in changeset.
mpm_unix: Add ap_mpm_podx_* implementation to avoid code duplication

and align w/ trunk.

trunk patch:

2.4.x patch:

Submitted by: jim

Reviewed by: rjung, minfrin

  1. … 12 more files in changeset.
Merge r1327036, r1327080 from trunk:

* server/mpm_unix.c (dummy_connection): Use a TLS 1.0 close_notify

alert if the chosen listener is configured for https; not perfect

but better than sending an HTTP request. Adjust comments.

* server/mpm_unix.c (dummy_connection): Fix spello.

Reviewed by: jorton, jim, covener

  1. … 2 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.
Merge r1300171 from trunk:

* server/mpm_unix.c (dummy_connection): Destroy temp pool and return

on connect() failure.

Reviewed by: jim, trawick, jorton

[added user-incomprehensible CHANGES entry as directed ;) ]

  1. … 1 more file 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.