Checkout Tools
  • last updated 2 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merge r1816534 from trunk:

* support/, acinclude.m4: Add OpenSSL libraries at the end of the

ab link line, not the start.

[too boring for CHANGES]

Submitted by: jorton

Reviewed by: jorton, jim, ylavic

  1. … 2 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 r1729235, r1730079, r1801665 from trunk:

Exclude MPM modules from automatic LoadModule

enabling when configure was called with

-enable-load-all-modules. The default MPM

should still get enabled automatically.

Use different variables to track normal

modules and MPMs during build.

Normal modules and MPMs follow different

rules in the config, e.g. we are only

allowed to have one active LoadModule

for an MPM in the config.

As a side effect, LoadModule for MPMs

will now come before LoadModule for

the normal modules. fix MPM_MODULES typo

Submitted by: rjung, jchampion

Reviewed by: jchampion, icing, ylavic

  1. … 4 more files in changeset.
Merge ^/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat:

Support OpenSSL 1.1.0

Proposed by: rjung

Reviewed by: wrowe, jorton, covener

  1. … 15 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 r1750507, r1750553 from trunk:

Fix proxy balancer lbmethod --enable defaults to follow proxy_balancer

Small change to r952007, ensure we don't wipe out the $enable_foomod value

when that value is 'shared'. The 'yes', 'shared', 'static' and 'no' values

are all valid.

Submitted by: wrowe

Reviewed/backported by: jim

  1. … 3 more files in changeset.

Merge r1749925 from trunk:

Promote any static module to yes|shared if a required dependency is not static

Submitted by: wrowe

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1750335, r1750407, r1750420 from trunk:

Ensure not-selected means 'no', once an APACHE_MODULE enable_foo is processed

Account for explicit enable- cases of 'shared', 'few', 'all', 'reallyall'

This is not C code... no semi, a colon is a noop

Submitted by: wrowe

Reviewed/backported by: jim

  1. … 2 more files in changeset.
configure: Do not treat dependency exceptions with --enable-modules

of only 'few' or 'none' as fatal, but continue the ./configure

Submitted by: trawick

Backports: r1396440 [only the acinclude.m4, config5.m4 change was N/A]

Reviewed by: wrowe, rpluem, ylavic

  1. … 3 more files in changeset.
Revert r1749920, meant to apply this to trunk/
  1. … 1 more file in changeset.
Promote any static to a shared module if the required dependency is dynamic
Merge r1749658 from trunk:

Support multiple module dependencies for the final prereq argument to the

APACHE_MODULE macro, as a comma separated list, e.g.

APACHE_MODULE(proxy_http2, [...], [proxy,http2])

will evaluate the availability of mod_proxy, followed by mod_http2

Submitted by: wrowe

Reviewed/backported by: jim

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

* Since r1724820 two modules, mod_http2 and mod_ssl, call APACHE_CHECK_OPENSSL,

with mod_http2 doing it first. Because the result of APACHE_CHECK_OPENSSL

is cached this causes MOD_LDFLAGS and MOD_CFLAGS to remain unset for mod_ssl

which in turn causes it not to be linked against Openssl which means that

mod_ssl cannot be loaded if the Openssl libs haven't been loaded by other means


Fix this by caching the values for MOD_LDFLAGS and MOD_CFLAGS created during

the first run and set them in the cached case.

Submitted by: rpluem

Reviewed/backported by: jim

  1. … 1 more file in changeset.
Merge r1706918 from trunk:

m4: please any autoconf by quoting AC_DEFUN's names. PR 58126.

Submitted by: olli hauer <ohauer>

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 6 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 r1674542, r1675410, r1676842 from trunk:

mod_ssl: Check for RAND_egd() at configure time and only use it if present.

Fixes the build with LibreSSL which does not provide this function.

Submitted by: Bernard Spil <pil.oss gmail com>, stsp

Committed by: stsp

mod_ssl: Make the config parser complain if SSLRandomSeed specifies

the Entropy Gathering Daemon (EGD) as source while the underlying

SSL library does not support EGD (e.g. in case of LibreSSL).

Suggested and reviewed by: kbrand

Follow up to r1674542 and r1675410: CHANGES entry.

Submitted by: stsp, ylavic

Reviewed/backported by: jim

  1. … 5 more files in changeset.
Merge r1652930, r1652933 from trunk

* acinclude.m4: Generate #LoadModule directive in default httpd.conf for

every --enable-mpms-shared. PR 53882.

Submitted by: olli hauer <ohauer>, Yann Ylavic

Reviewed by: ylavic, rjung, jailletc36

Backported by: jailletc36

  1. … 2 more files in changeset.
Complement to r1542327 (Streamline and improve ephemeral key handling):

the change to acinclude.m4 (part of r1527294) was left out from the

backport proposal by mistake.

Originally proposed by: kbrand. Reviewed by: jim, jorton (cf. r1542297).

Merge r1428184, r1429228 from trunk:

Improve pkg-config usage for mod_ssl/ab:

also use pkg-config for determining the -l flags (and fall back

to a hardcoded default of "-lssl -lcrypto")

add --static to pkg-config invocations, so that libraries for

static linking are also taken into account (PR 54252 - note that

the additional flags will only appear in modules/ssl/

and ab_LDFLAGS, so potential side effects are limited)

separate --libs-only-L and --libs-only-other into two invocations

(can't be used concurrently, only the first takes effect)

use --silence-errors where applicable

mod_ssl/ab: only use "--static" for pkg-config when explicity requested

(by adding an "--enable-ssl-staticlib-deps" option to configure)

Submitted by: kbrand

Reviewed/backported by: jim

  1. … 4 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 r1234180, r1234297, r1234565:

Make APACHE_MODULE() accept an optional prerequisite module for configure.

Introduce the following configure time dependencies:

mod_proxy_* (except proxy_html) require mod_proxy

mod_dav_* require mod_dav

mod_session_* require mod_session

mod_cache_disk requires mod_cache

mod_heartbeat requires mod_watchdog

PR: 52487

  1. … 9 more files in changeset.
Pre GA removal ob components that will not be included:

Part 2: Remove mod_serf.

  1. … 16 more files in changeset.
Merge r1200475, r1200478, r1200482, r1200491, r1200513, r1200550, r1200580, r1200605, r1200612, r1200614, r1200639, r1200646, r1200656, r1200667, r1200679, r1200699, r1200957, r1200961, r1200963 from trunk:

fix issue with incorrect munging of the lua package path -- LuaPackagePath directives were not working

Default to not allowing htaccess in /, instead of just the documentroot, which gets a nice 10% performance boost by default for me.

* modules/ssl/ssl_private.h, modules/ssl/ssl_engine_kernel.c

(ssl_callback_tlsext_tickets): Use unsigned char * to fix gcc

-Wpointer-sign warnings.

Only load the really imporant modules (i.e. those enabled by the 'few'

selection) by default. Don't handle modules enabled with --enable-foo


This fixes problems with module dependencies until someone implements a

mechanism for resolving module dependencies.

remove last traces of the code cache

* modules/proxy/mod_proxy_html.c (comp_urlmap): Fix const-ness warning.

* modules/lua/mod_lua.c (ap_lua_ssl_is_https): New function.

(lua_post_config): Pick up ssl_is_https optional function.

* modules/lua/lua_request.c (req_ssl_is_https_field): New function.

(ap_lua_load_request): Map is_https field to above.

remove some debug logging which snuck in

remove ability to set min and max pool sizes for server scope in prep for removing server scope

remove lingering reslist references before killing server scope

replace server scope with thread scope

use a sub-pool for scope_once

Fix installation of conf/extra/proxy-html.conf.

Otherwise httpd does no longer start, because

it is the only extra file required in the main

config at the moment.

Rebuild xdoc transform

Clarify docs for LimitRequestLine, as per bug #51665.

Rebuild doc transforms.

Submitted by: brianm, pquerna, jorton, sf, brianm, jorton, jorton, sf, pquerna, brianm, brianm, brianm, brianm, brianm, jorton, rjung, rbowen, rbowen, rbowen

Reviewed/backported by: jim

  1. … 19 more files in changeset.