Checkout Tools
  • last updated 7 hours ago
Constraints: committers
Constraints: files
Constraints: dates
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

  1. … 5 more files in changeset.
Merge r1341905, r1342065, r1341930, r1345147, r1344712, r1814465 from trunk:

suexec: Add support for logging to syslog as an alternative to a


* support/suexec.c (err_output) [AP_LOG_SYSLOG]: Log to syslog.

(main): Close syslog fd if open, before execv. Add -V output


* Add --with-suexec-syslog argument; allow

--without-suexec-logfile to omit definition of AP_LOG_EXEC.

suexec: Support use of setgid/setuid capability bits on Linux, a

weaker set of privileges than the full setuid/setgid root binary.

* Add --enable-suexec-capabilites flag.

* If configured, use setcap instead of chmod 7555 on

installed suexec binary.

* modules/arch/unix/mod_unixd.c (unixd_pre_config): Drop test for

setuid bit if capability bits are used.

* docs/manual/: Add docs.

* docs/manual/suexec.html.en: Update for syslog logging.

* Correct handling of --with-suexec-logfile in r1341905,

thanks to rpluem.

* support/suexec.c: Define AP_LOG_FACILITY.

(err_output): Use AP_LOG_FACILITY for syslog facility.

Suggested by: kbrand

* Fix help text for --with-suexec-syslog.

Submitted by: jorton

Reviewed by: jorton, ylavic, jim

  1. … 7 more files in changeset.
Merge r1812263, r1812301 from trunk:

Fix maintainer mode with GCC/Clang.

Setting -Wstrict-prototypes in combination

with -Werror leads to compiler errors during

configure checks (autoconf generates incomplete


Adding -Wno-error=strict-prototypes lets the

compiler tolerate those.

Possible future enhancement: remember such

"configure time only" flags and remove them

from CFLAGS before generating our build time

files (Makefile, etc.), so that

the full -Werror is in place during building.

Follow up to r1812263.

As suggested by Joe, add --maintainer/debugger-mode's CFLAGS in

NOTEST_CFLAGS to avoid interractions with autoconf's AC_LANG_PROGRAM.

APACHE_ADD_GCC_CFLAG now also forces -Wno-strict-prototypes for -Werror

to work despite AC_LANG_PROGRAM generating this warning by itself.

Submitted by: rjung, ylavic

Reviewed by: ylavic, rjung, jim

  1. … 3 more files in changeset.
Merge r1702948, r1759415 from trunk:

httpd compiles warning free on gcc and every new warning will be treated as an error, standard c-89 is enforced

http_config: follow up to r1702948: maybe unused, yet maybe usefull too.

Submitted by: icing, ylavic

Reviewed/backported by: jim

  1. … 6 more files in changeset.
Merge r1753315, r1753316 from trunk:

configure: move away from obsolete AC_OUTPUT args

AC_OUTPUT's use with arguments was obsoleted back at or before autoconf

2.50. Replace it with the preferred AC_CONFIG_FILES/AC_CONFIG_COMMANDS


configure: remove orphaned APACHE_OUTPUT macro

The last use of APACHE_OUTPUT appears to have been removed back in


Submitted by: jchampion

Reviewed/backported by: jim

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

Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q


Submitted By: Daniel Shahaf

Committed By: covener

Submitted by: covener

Reviewed/backported by: jim

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

Fix detection of old Solaris versions.

Autotools need double square brackets.

Submitted by: rjung

Reviewed/backported by: jim

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

Fix --enable-v4-mapped configuration on *BSD. PR 53824.

Submitted by: olli hauer <ohauer>

Committed by: ylavic

Submitted by: ylavic

Reviewed/backported by: jim

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

FreeBSD: Disable IPv4-mapped listening sockets by default for versions

5+ instead of just for FreeBSD 5.

PR: 53824

Submitted by: trawick

Reviewed/backported by: jim

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

maintainer-mode should auto-enable mod_bucketeer

Reviewed/backported by: jim

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

core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization

on Linux kernel versions 3.x and above.

PR: 55121

Submitted by: Bradley Heilbrun <apache>

Reviewed by: trawick

Submitted by: trawick

Reviewed/backported by: jim

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

configure: Fix processing of --disable-FEATURE for various features.

Submitted by: trawick

Reviewed/backported by: jim

  1. … 6 more files in changeset.
Merge r1343109:

Make ap_regcomp() return AP_REG_ESPACE if out of memory. Make ap_pregcomp()

abort if out of memory.

This raises the minimum PCRE requirement to version 6.0, released in 2005.

Reviewed by: jim, sf, minfrin

  1. … 5 more files in changeset.
* core: Add in ap_get_sload() and ap_get_loadavg().

  1. … 7 more files in changeset.
backport r1385216, r1387610 from trunk:

Spin off module-specific build options into separate build vars.

[second try, supersedes r1385214]

Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,

which are available to modules for customization on a per-subdir

basis (by adding definitions to Reduces the risk

of side-effects when a module needs to add CFLAGS, LDFLAGS etc.

and these would be added to the global settings (ALL_CFLAGS etc.).

Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,

mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx

build variables.

Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead

of AC_SUBSTing them in build/ For support/ab, introduce

ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where

they appear at the proper position in the build commands.

Consistently use "--with-xxx=PATH" in configure help strings which

are used to specify a path to the installation directory of an

auxiliary package.

  1. … 7 more files in changeset.
Merge r1341906, r1341913 from trunk:

* acinclude.m4: Use AC_MSG_NOTICE.

* Use AC_MSG_NOTICE so passing --silent works as advertised.

Reviewed by: rjung, humbedooh, jorton

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

* Enforce 1.4.0 as minimum APR version requirement.

PR: 52748

Submitted by: jorton

Reviewed/backported by: jim

  1. … 1 more file in changeset.
Fix shell syntax error introduced in r1243670.

Backport of r1243797 and r1243799 from trunk.

  1. … 1 more file in changeset.
Fix out of tree build using apr and apr-util in srclib.

Also rephrase remaining mentioning of the deps package.

  1. … 1 more file in changeset.
Correct the --with_included_apr error message. We no longer provide

an included/bundled version of apr/apu for the convenience of

our users.

configure: Move the --with-included-apr check so that srcdir!=builddir builds

aren't broken by it.

Backport of r1232838 from trunk.

  1. … 1 more file in changeset.

configure: Improve the error message when --with-included-apr is specified

but either APR or APR-Util is not included.

  1. … 1 more file in changeset.
Set --enable-load-all-modules implicitely in

maintainer mode unless disabled explicitely.

Backport of r1201306 from trunk.

  1. … 1 more file in changeset.