Checkout Tools
  • last updated a few minutes ago
Constraints: committers
Constraints: files
Constraints: dates
Merge r1873985 from trunk:

Fix spelling errors found by codespell. [skip ci]

Submitted by: mrumph

Reviewed by: mrumph, jim, ylavic

  1. … 90 more files in changeset.
Merge r1855306 from trunk:

MPMs unix: bind the bucket number of each child to its slot number

We need not remember each child's bucket number in SHM for restarts, for the

lifetime of the httpd main process the bucket number can be bound to the slot

number such that: bucket = slot % num_buckets.

This both simplifies the logic and helps children maintenance per bucket in

threaded MPMs, where previously perform_idle_server_maintenance() could create

or kill children processes for the buckets it was not in charge of.

Submitted by: ylavic

Reviewed by: ylavic, rpluem, jorton

  1. … 5 more files in changeset.
MPMs: Initialize all runtime/asynchronous objects on a dedicated pool and

before signals handling to avoid lifetime issues on restart or shutdown.

PR 62658.

trunk patch:

2.4.x patch:

+1: ylavic, jim (but not for 2.4.35), minfrin

  1. … 8 more files in changeset.
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 r1618555 from trunk:

prefork: Ignore SIGINT in child. This fixes race-condition in signals handling

when httpd is runnning on foreground and user hits ctrl+c. In this case, SIGINT

is sent to all children followed by SIGTERM from the main process, which

interrupts the SIGINT handler and leads to inconsistency (process freezes

or crashes).

Submitted by: jkaluza

Reviewed by: ylavic, jorton, jim

  1. … 2 more files in changeset.
Merge from trunk:

mpm_{worker,prefork}: save some cycles by not copying the listener's pollfds

for each pollset operation.

We don't need a copy when poll()ing if those are allocated with the correct

lifetime (the listener thread) at the very beginning.

*) worker, prefork: save some cycles by not copying the listener's pollfds

for each pollset operation

trunk patch:

2.4.x patch: svn merge -c 1662437 ^/httpd/httpd/trunk .

+1: jailletc36, ylavic, jim

Submitted By: jailletc36

Reviewed By: jailletc36, ylavic, jim

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

Fix spelling in comments and text files.

No functional change.

PR 59990

Submitted by: rjung

Reviewed/backported by: jim

  1. … 72 more files in changeset.
Merge r1731929, r1736681 from trunk:

Join multi-line MPM startup log messages into

single long lines.

Followup to r1725394 and r1725548.

Fix missing space in log message

Submitted by: rjung, jailletc36

Reviewed by: jailletc36, ylavic, wrowe

  1. … 7 more files in changeset.
Merge r1629925, r1629927, r1629928, r1733162, r1733173 from trunk:

Ensure that httpd exits with an error status when the MPM fails

to run. [Yann Ylavic]

  1. … 8 more files in changeset.
Merge r1711479, r1733064, r1733068 from trunk:

Fix crash in ap_mpm_pod_check call caused by NULL dereference of its parameter

when starting httpd as single process (httpd -X).

Revert changes on mpm_event and mpm_worker from r1711479.

The POD is not used in one process mode for those MPMs.

Follow up to r1711479 and r1733064: CHANGES entry.

Submitted by: jkaluza, ylavic, ylavic

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Add APLOGNO, first chunk (those that were

detected by coccinelle).

There are some more but they are easier to

backport once these here are applied.

Backport of r1725392, r1725394, r1725395

and r1725468 from trunk.

Submitted by: rjung

Reviewed by: jim, ylavic

  1. … 38 more files in changeset.
Merge r1629916 from trunk:

core: follow up to r1629909: ap_daemons_to_start can't be lower than 1 (not 0) for prefork either.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 2 more files in changeset.
MPMs: Support SO_REUSEPORT to create multiple duplicated listener

records for scalability.

Submitted by: Yingqi Lu <>, Jeff Trawick,

Jim Jagielski, Yann Ylavic

Reviewed by: ylavic, jim, minfrin

  1. … 13 more files in changeset.
Merge 1387633,1392850 from trunk:

* server/mpm/prefork/prefork.c (child_main): Don't log errors for an

apr_pollset_add() failure if a graceful-stop has been signalled.

follow up to r1387633: use the right exit code depending on the error scenario

Submitted by: jorton, trawick

Reviewed by: trawick, minfrin, jorton

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

fix child exit status in prefork after certain errors in

the child so that the parent resets the spawn rate to the



mpm_prefork: Reduce spawn rate after a child process exits due to

unexpected poll or accept failure.

Submitted by: trawick

Reviewed/backported by: jim

  1. … 2 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.