Checkout Tools
  • last updated 3 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merge r1869499, r1869500 from trunk:

Use latest/compatible apr_common.m4.

Never checkin generated files applied to build/apr_common.m4.

Reviewed on dev@ by: ylavic, icing, rpluem

  1. … 1 more file in changeset.
Merged /httpd/httpd/trunk:r1864924,1868506,1868654,1868927 from trunk

*) mod_md: Adding the several new features.

The module offers an implementation of OCSP Stapling that can replace fully or

for a limited set of domains the existing one from mod_ssl. OCSP handling

is part of mod_md's monitoring and message notifications. If can be used

for sites that do not have ACME certificates.

The url for a CTLog Monitor can be configured. It is used in the server-status

to link to the external status page of a certicate.

The MDMessageCmd is called with argument "installed" when a new certificate

has been activated on server restart/reload. This allows for processing of

the new certificate, for example to applications that require it in different

locations or formats.

  1. … 51 more files in changeset.
Merge r1856560, r1856561, r1856846 from trunk:

Update apr_common.m4 to latest (trunk).

Note: why is that file in the httpd repo??

Revert r1856560: was not the latest apr_common.m4 version anyway...

How does that change came in my local workspace in the first place??

Well, our build with latest APR trunk seems to insist on updating apr_common.m4

So be it.

Submitted by: ylavic

Reviewed by: rjung, jorton, jim

  1. … 2 more files in changeset.
Merge r1780441, r1780470, r1795928 from trunk:

buildconf: allow configuration without APR sources

Previously we required copying the APR (and APR-util) source code into

srclib or some other location on disk in order to build httpd directly

from source. This is annoying if you're on a distribution that already

has the required files in its APR dev packages.

Practically speaking, if you're not building an official distribution

tarball, you only need the following files:

1) config.guess

2) config.sub

3) find_apr.m4

4) find_apu.m4

5) PrintPath

1 and 2 come from automake. 3 and 4 are included in some distributions'

(e.g. Debian's) development packages for APR/-util. That leaves

PrintPath, which has not changed meaningfully in over a decade and is

checked in completely here.

Passing an apr-config executable to buildconf's --with-apr option will

now enable a mode in which the above files (minus PrintPath) are copied

from their respective homes, removing the need for APR sources on disk.

Otherwise, if a source tree is passed, the current behavior is retained

and all of the above files are copied from APR directly.

buildconf: add --help for the new behavior

buildconf's behavior is a little complicated (and was made more so with

apr-config mode), so add some self-documentation.

buildconf: check in APR[-util] m4 macros

Suggestion by wrowe. These files haven't changed in years; since we need

them anyway, check them in directly. buildconf will still copy over the

latest versions during setup, and SVN will tell us if there are any


Submitted by: jchampion

Reviewed by: jchampion, jim, ylavic

  1. … 6 more files in changeset.