Checkout Tools
  • last updated 5 hours ago
Constraints
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: http://svn.apache.org/r1835845

http://svn.apache.org/r1835846

http://svn.apache.org/r1837354

http://svn.apache.org/r1837356

http://svn.apache.org/r1839571

http://svn.apache.org/r1839583

2.4.x patch: http://home.apache.org/~ylavic/patches/2.4.x-mpms_async_objects_lifetime.patch

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

  1. … 8 more files in changeset.
Merge r1821624, r1821625, r1821626, r1821627, r1821629, r1821632, r1821635, r1821639, r1821644, r1821647, r1821648, r1821649, r1821650, r1821651, r1821659, r1821660, r1822366, r1822367, r1824381 from trunk:

Shared fdqueue code between MPMs event and worker into mpm_fdqueue.

This first step moves the files server/mpm/event/fdqueue.[ch] to

server/mpm_fdqueue.[ch] (untouched for now, simple svn move).

Will follow up with the necessary changes to mpm_unix.* for common code.

mpm_fdqueue: follow up to r1821624.

And now it's mpm_fdqueue, with minimal #includes.

mpm_fdqueue: follow up to r1821624.

Opacify fdqueue types.

mpm_fdqueue: follow up to r1821624.

Style, no functional change.

mpm_fdqueue: follow up to r1821624.

Rename ap_queue_info_get_idlers() to ap_queue_info_num_idlers().

mpm_fdqueue: follow up to r1821624.

Clear recycled_pools_count in ap_free_idle_pools().

mpm_fdqueue: follow up to r1821624.

Prepare mpm_worker to use common fdqueue.

mpm_worker: follow up to r1821624.

Use common [mpm_]fdqueue.

mpm_fdqueue: follow up to r1821624.

The implemention wants APR_HAS_THREADS too.

mpm_fdqueue: follow up to r1821624.

The code is not part of the API.

mpm_fdqueue: follow up to r1821624.

Fix typo in comment.

mpm_fdqueue: follow up to r1821624.

Cosmetics, 80 cols, no functional change.

mpm_worker: follow up to r1821624.

Free idle pools while stopping.

mpm_fdqueue: follow up to r1821624.

Be explicit in the naming about what's push/pop-ed.

mpm_fdqueue: follow up to r1821624.

Either error matters, simplify code.

mpm_fdqueue: follow up to r1821624.

Make the allocation and zero-ing in ap_queue_init() => ap_queue_create().

mpm_fdqueue: follow up to r1821624.

Export ap_queue_*() fonctions, so that they are accessible from MPMs, but

don't provide "mpm_fdqueue.h" in the API (include/).

mpm_fdqueue: follow up to r1821624.

80 colums.

Follow up to r1821624: CHANGES entry.

Submitted by: ylavic

Reviewed by: ylavic, minfrin, jim

  1. … 12 more files in changeset.
Merge r1821504, r1821505 from trunk:

mpm_{event,worker}: Mask signals for threads created by modules in child init.

PR 62009, so that they don't receive (implicitely) the ones meant for the MPM.

Inspired by: Armin Abfalterer <a.abfalterer gmail.com>

Follow up to r1821504: same comment in event than in worker.

Proposed by: ylavic

Reviewed by: ylavic, icing, covener

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

freed.

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 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: http://svn.apache.org/r1662437

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 r1750218 from trunk:

Follow up to r1737447: fix max_spare_threads lower bound.

Suggested by: Rick Houser <rick.houser jackson.com>

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 3 more files in changeset.
mpm_event, mpm_worker: Fix computation of MinSpareThreads' lower bound

according the number of listeners buckets.

Submitted by: ylavic

Reviewed by: jim, minfrin

  1. … 4 more files in changeset.
Merge r1741310, r1741461 from trunk:

Ensure http2 follows http in the meaning of

status WRITE (meaning 'in the request processing

phase' even if still consuming the request body,

not literally in a 'now writing' state).

Ensure a number of MPMs and the h2 connection io

no longer clobber the request status line during

state-only changes. While at it, clean up some

very ugly formatting and unnecessary decoration,

and avoid the wordy _from_conn() flavor when we

are not passing a connection_rec.

Ensure the useragent_ip is only used in the case

where it has been initialized, fall back on the

connection's remote_ip if the status is accidently

updated from an uninitialized request_rec.

Revert to 2.4.1 behavior and null the request and vhost as appropriate.

PR: 59333

Submitted by: wrowe

Reviewed by: wrowe, ylavic, rpluem

  1. … 9 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.
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.
MPMs: Support SO_REUSEPORT to create multiple duplicated listener

records for scalability.

Submitted by: Yingqi Lu <yingqi.lu@intel.com>, Jeff Trawick,

Jim Jagielski, Yann Ylavic

Reviewed by: ylavic, jim, minfrin

  1. … 13 more files in changeset.
Fix some comment typos
  1. … 1 more file in changeset.
missed in applied patch

mpm_unix: Add ap_mpm_podx_* implementation to avoid code duplication

and align w/ trunk.

trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1409214

http://svn.apache.org/viewvc?view=revision&revision=1410004

2.4.x patch: http://people.apache.org/~jim/patches/httpd-2.4-podx-v2.patch

Submitted by: jim

Reviewed by: rjung, minfrin

  1. … 12 more files in changeset.
worker MPM: Don't forcibly kill worker threads if the child process is

exiting gracefully.

Submitted by: Oracle, via trawick

This modification was made some years ago for Oracle HTTP Server

by an Oracle employee.

Proposed by: trawick

Reviewed by: jim, rjung

Backport of r1526220 from trunk.

  1. … 2 more files in changeset.
event MPM: Provide error handling for ThreadStackSize. PR 54311

trunk patch: http://svn.apache.org/r1433682

Submitted by: Tianyin Xu <tixu cs.ucsd.edu>

Reviewed by: minfrin, jailletc36, sf

  1. … 4 more files in changeset.
mpm_event, mpm_worker: Remain active amidst prevalent child process

resource shortages.

Submitted by: trawick

Reviewed by: jorton, rjung, jim

  1. … 4 more files in changeset.
Merge r1363440 from trunk:

mpm_event, mpm_worker: Fix cases where the spawn rate wasn't reduced

after child process resource shortages.

The broken scenario:

child X exits with APEXIT_CHILDSICK

another child Y is created and reuses child X's scoreboard slot

child X's exit status is processed

The case that worked is when child X's scoreboard slot hadn't

been reused by the time that its exit status was processed.

Submitted by: trawick

Reviewed/backported by: jim

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