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

Changeset 1873519 is being indexed.

Merge r1393976, r1393997, r1484554, r1528032, r1528034, r1614821, r1618579, r1618588, r1802251, r1840554, r1840555, r1872761, r1872763 from trunk:

* modules/arch/unix/mod_systemd.c: New module.

Submitted by: Jan Kaluza <jkaluza>

* modules/arch/unix/mod_systemd.c (systemd_pre_mpm): Simplify code

slightly; no functional change.


* Simplify/fix systemd detection: move later to fix

autoconf warnings; define HAVE_SYSTEMD rather than using CPPFLAGS.

* server/listen.c: Use HAVE_SYSTEMD for systemd #define.

* modules/arch/unix/config5.m4: Update systemd headers check.

Don't link support/* against systemd libs.

* Link httpd using $(HTTPD_LIBS).

* Add systemd to HTTPD_LIBS rather than LIBS. Add PCRE

libs to HTTPD_LIBS.

*, acinclude.m4: Move systemd check to APACHE_CHECK_SYSTEMD

and use pkg-config where available.

mod_systemd: Add IdleShutdown - number of seconds in idle-state after which

httpd is shutdown. This is useful in a combination with socket activation.

Add mod_systemd documentation.

mod_systemd: Use AP_SIG_GRACEFUL instead of SIGWINCH.

Fix overriding ExtendedStatus to "off" with mod_systemd loaded, and

give more feedback to systemd during a reload.

* modules/arch/unix/mod_systemd.c (systemd_pre_config): New

function; tell systemd the service is reloading here.

(systemd_pre_mpm): Don't set ap_extended_status here, do nothing

if ExtendedStatus is off.

(register_hooks): Register pre_config hook.

* modules/arch/unix/mod_systemd.c (systemd_post_config): Fix systemd

service getting stuck reloading if "ExtendedStatus off" is

configured; regression in r1802251.

PR: 62697

* modules/arch/unix/mod_systemd.c (systemd_pre_mpm, systemd_monitor):

Ignore sd_notify{,f} failure cases as currently recommended by the

systemd API docs.

* modules/arch/unix/mod_systemd.c: Remove IdleShutdown feature which

was buggy per sf's feedback in 2.4.x backport proposal, and would

probably be more appropriate outside this module anyway.

* modules/arch/unix/config5.m4: Don't override enable_systemd, fixing

--enable-systemd=static per covener's suggestion in


Also fix the APACHE_MODULE() usage; disable the module by default

for the "all" modules selection.

PR: 57632

Submitted by: jkaluza, jorton, nd

Reviewed by: jorton, jim, elukey

    • ?
fr doc rebuild.

  1. … 7 more files in changeset.
fr doc XML files updates.

fr doc rebuild.

fr doc XML files updates.

Vote on mod_systemd's backport patch

Tested building the module from a fresh copy of 2.4.x

on Debian 10 (Buster). Tested a systemd unit with "Type=notify",

everything works as expected. Thanks Joe!

Fix tests for trunk after r1873397.

    • ?
PR62989: DOCTYPE tags in server-generated HTML.

Submitted By: Andra Farkas <deepbluemistake>, Giovanni Bechis <giovanni>

Merge r1873395 from trunk:

PR63678: Clarify fcgistarter -c parm

Submitted By: Giovanni Bechis <giovanni>

PR63678: Clarify fcgistarter -c parm

Submitted By: Giovanni Bechis <giovanni>

PR63669: handle APR_BADARG return from ap_rgetline

Submitted By: Giovanni Bechis <giovanni>

Fix some grammar errors in the docs

Update generated docs.

Fix some grammar errors in the docs

Merge r1871810 from trunk:

*) mod_http2: Fixed rare cases where a h2 worker could deadlock the main connection.

Submitted by: icing

Reviewed by: icing, jim, steffenal

Merge r1872455 from trunk:

add r/o iterable tables

The current apr tables exposed support get/set but we cannot get the keys

or iterate. add _table() alternatives

Submitted by: covener

Reviewed by: covener, jim, humbedooh

Merge r1870650 from trunk:

PR63971 expose apr_table_unset for headers/envvars

via nil assignment

Submitted by: covener

Reviewed by: covener, jim, humbedooh

Update generated docs

  1. … 4 more files in changeset.
Fixed some grammar errors in the docs.

Fixed some grammar errors in the docs.

Update generated docs.

  1. … 253 more files in changeset.


Propose PR 64096 fix. [skip ci]

Have not seen false negatives with t/apache/expr_string.t since

r1872705 so let's try e-mail notifications for 2.4.x again. [skip ci]

casting some votes
Vote mod_http2


Had some time... votes on backports

Add tag and revision to release vote email template