Add a new way to document changes
* Makefile.in: Define the update-changes target to merge the change files
from the changes directory to the top of the CHANGES file and remove
them afterwards. If a Subversion binary was found during configure try
to svn rm them otherwise just delete them.
* configure.in: Search for the Subversion binary.
* acinclude.m4: Set the corresponding Makefile variable for the Subversion
binary.
* README.CHANGES: New file to document the new approach.
Can we have mercy with people working on case-preserving file systems?
Consider case insensitive filessystems
Consider case insensitive filessystems and thus choose a new non conflicting
name for the directory to store CHANGES entries.
Reviewed by: rpluem, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1881728 13f79535-47bb-0310-9956-ffa450edef68
systemd dependencies are only needed by mod_systemd.
They should currently not be needed by httpd directly
or any other binary. So no need to add them to
HTTPD_LIBS.
Submitted by: rjung
Reviewed by: rjung, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876892 13f79535-47bb-0310-9956-ffa450edef68
They should currently not be needed by httpd directly
or any other binary. So no need to add them to
HTTPD_LIBS.
Should be CTR (build system).
Backport of r1876869 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876870 13f79535-47bb-0310-9956-ffa450edef68
* modules/arch/unix/mod_systemd.c: New module.
Submitted by: Jan Kaluza <jkaluza redhat.com>
* modules/arch/unix/mod_systemd.c (systemd_pre_mpm): Simplify code
slightly; no functional change.
Use AP_DECLARE_MODULE.
* configure.in: 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.
* Makefile.in: Link httpd using $(HTTPD_LIBS).
* configure.in: Add systemd to HTTPD_LIBS rather than LIBS. Add PCRE
libs to HTTPD_LIBS.
* configure.in, 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
<CALK=YjPrN644NtLROwYPyBeCpev-GHSAD2J-Z2hupLymZ0op-g@mail.gmail.com>
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873519 13f79535-47bb-0310-9956-ffa450edef68
* support/Makefile.in, 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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1823624 13f79535-47bb-0310-9956-ffa450edef68
Fix maintainer mode with GCC/Clang.
Setting -Wstrict-prototypes in combination
with -Werror leads to compiler errors during
configure checks (autoconf generates incomplete
prototypes).
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, config_vars.mk 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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1812437 13f79535-47bb-0310-9956-ffa450edef68
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.
Makefile.in: fix MPM_MODULES typo
Submitted by: rjung, jchampion
Reviewed by: jchampion, icing, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808854 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1772330 13f79535-47bb-0310-9956-ffa450edef68
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
calls.
configure: remove orphaned APACHE_OUTPUT macro
The last use of APACHE_OUTPUT appears to have been removed back in
r87231.
Submitted by: jchampion
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1762055 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750684 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750484 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750254 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1749773 13f79535-47bb-0310-9956-ffa450edef68
* 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
already.
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1729872 13f79535-47bb-0310-9956-ffa450edef68
Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q
PR58202.
Submitted By: Daniel Shahaf
Committed By: covener
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701408 13f79535-47bb-0310-9956-ffa450edef68
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1679199 13f79535-47bb-0310-9956-ffa450edef68
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).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1555469 13f79535-47bb-0310-9956-ffa450edef68
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/modules.mk
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1440507 13f79535-47bb-0310-9956-ffa450edef68
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 modules.mk). 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/rules.mk.in. 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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390518 13f79535-47bb-0310-9956-ffa450edef68
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
specially.
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200981 13f79535-47bb-0310-9956-ffa450edef68
or explicitly selected by a configure --enable-foo argument. The
LoadModule statements for modules enabled by --enable-mods-shared=most
and friends will be commented out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199027 13f79535-47bb-0310-9956-ffa450edef68
-Wformat
-Wformat-security
-Werror=format-security
-Werror=declaration-after-statement
Add new macro APACHE_ADD_GCC_CFLAGS to do the compatibility check.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180331 13f79535-47bb-0310-9956-ffa450edef68
mod_proxy_fdpass being built shared even with --enable-mods-static=reallyall.
Document bug/limitiation in APACHE_MODULE macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154126 13f79535-47bb-0310-9956-ffa450edef68
Let's assume that if a system has the openssl dev headers installed in
the default location, it is very unlikely that crypto is forbidden in
the country that the system is located in.
If no ssl toolkit is found, disable mod_ssl instead of aborting.
The actual change is small, use 'diff -b' to review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1150471 13f79535-47bb-0310-9956-ffa450edef68
-DAP_DECLARE_EXPORT (MinGW builds) out of the *CPPFLAGS
used for third-party module builds
introduce INTERNAL_CPPFLAGS for that; apxs bypasses this
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1101211 13f79535-47bb-0310-9956-ffa450edef68
the available libs.
- Remove redundant --with-distcache option. Simply enable distcache if
mod_socache_dc is selected.
- Enable serf support by default if serf is available in /usr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956221 13f79535-47bb-0310-9956-ffa450edef68
MPM event was picking up the headers but not linking with libserf, causing
unresolved symbol errors.
Now build MPM event with or without serf support depending on --with-serf
being specified or not.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954273 13f79535-47bb-0310-9956-ffa450edef68
Static building can be achieved with --enable-mods-static
or as previously using --enable-MODULE=static.
The existing --enable-mods-shared still works for
compatibility with existing build scripts.
Modules build with --with-module=... will still be build static.
For dynamic builds of external modules there is apxs.
The default set of modules os now "most". To build a small
set of modules use the new "few".
If APR doesn't support DSOs we fall back to static binding.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@952007 13f79535-47bb-0310-9956-ffa450edef68
