1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

407 Commits

Author SHA1 Message Date
Rainer Jung
df2e9f3ba4 Fix detection of old Solaris versions.
Autotools need double square brackets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652982 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 12:22:34 +00:00
Yann Ylavic
9773787f37 Fix --enable-v4-mapped configuration on *BSD. PR 53824.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652929 13f79535-47bb-0310-9956-ffa450edef68
2015-01-19 08:06:56 +00:00
Joe Orton
d91f672d4f * configure.in, acinclude.m4: Move systemd check to APACHE_CHECK_SYSTEMD
and use pkg-config where available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1614821 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 07:56:44 +00:00
Rainer Jung
04819b5810 Fix syntax error introduced in r1612921.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1613029 13f79535-47bb-0310-9956-ffa450edef68
2014-07-24 07:53:20 +00:00
Rainer Jung
165f9ffcdd Check for correct minimum PCRE version in configure,
do not check in source code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1612921 13f79535-47bb-0310-9956-ffa450edef68
2014-07-23 19:01:45 +00:00
Ben Reser
80d149de6b Fix PCRE_DUPNAMES check to find the header file for PCRE when PCRE isn't in
the default includes path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1585590 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 21:26:23 +00:00
Jim Jagielski
a0529d925c Check if PCRE_DUPNAMES exists at configure time
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1579259 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 15:23:35 +00:00
Jim Jagielski
6afe8c8172 Allow user to explicitly determine whether or not BSD syntax
makefiles should be created... The default is NO unless we
are on a *BSD* system, in which case we actually see if
'make' is gmake or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1553134 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 16:08:36 +00:00
Jim Jagielski
d6e91afa0c For *bsd* systems, see if we are using BSD make and,
if so, then use that format for include/ifdef/else/endif


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1552779 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 18:48:14 +00:00
Jeff Trawick
f5c08d3b82 FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.

PR: 53824


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1551685 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:25:54 +00:00
Joe Orton
c19caf3219 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528034 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 10:25:02 +00:00
Joe Orton
f6f568d30c * 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528032 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 10:15:12 +00:00
Paul Querna
ba9ab903c4 Add support for systemd socket activation to listener sockets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1511033 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 16:51:15 +00:00
Jim Jagielski
9a78212031 maintainer-mode should auto-enable mod_bucketeer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1503680 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 12:18:35 +00:00
Jeff Trawick
fdafc9e397 core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
on Linux kernel versions 3.x and above.

PR: 55121
Submitted by: Bradley Heilbrun <apache heilbrun.org>
Reviewed by: trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1496429 13f79535-47bb-0310-9956-ffa450edef68
2013-06-25 11:45:19 +00:00
Stefan Fritsch
8736e6a6d0 Avoid valgrind warnings in mod_ssl random number generator
We intentionally add uninitialized stack memory. To avoid warnings,
make valgrind believe that the memory is defined.

Add configure option to enable valgrind support


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1442307 13f79535-47bb-0310-9956-ffa450edef68
2013-02-04 19:34:08 +00:00
Jeff Trawick
af3f141309 follow-up to r1389481: find/use getloadavg() prototype on Solaris
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1397716 13f79535-47bb-0310-9956-ffa450edef68
2012-10-12 20:22:33 +00:00
Jeff Trawick
710f0e5eb2 configure: Fix processing of --disable-FEATURE for various features.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1397687 13f79535-47bb-0310-9956-ffa450edef68
2012-10-12 18:58:00 +00:00
Jim Jagielski
1134cfb81d Would be nice to have some sort of canonical definition
of server loading for Apache. So create a struct that
holds some useful data. The hope is that for those
platforms that lack getloadavg(), people will write
replacements.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389481 13f79535-47bb-0310-9956-ffa450edef68
2012-09-24 16:56:58 +00:00
Jeff Trawick
d5eedd1a20 consolidate hints/instructions about using APR (and maybe APR-util) with httpd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389060 13f79535-47bb-0310-9956-ffa450edef68
2012-09-23 14:11:02 +00:00
Kaspar Brand
089f0eb0ac 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/trunk@1385216 13f79535-47bb-0310-9956-ffa450edef68
2012-09-16 06:19:13 +00:00
Kaspar Brand
5eb4537e2a revert r1385214, as I inadvertently left out acinclude.m4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1385215 13f79535-47bb-0310-9956-ffa450edef68
2012-09-16 06:16:35 +00:00
Kaspar Brand
3aaa0378b6 Spin off module-specific build options into separate build vars.
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/trunk@1385214 13f79535-47bb-0310-9956-ffa450edef68
2012-09-16 05:55:02 +00:00
Jeff Trawick
4e20b1eba5 fix APREQ declarations for MinGW builds
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1363033 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 18:15:25 +00:00
Joe Orton
48b343524e * configure.in: Enforce 1.4.0 as minimum APR version requirement.
PR: 52748


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1347998 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 10:04:44 +00:00
Joe Orton
bd4d8fd4a2 * configure.in: Correct handling of --with-suexec-logfile in r1341905,
thanks to rpluem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1345147 13f79535-47bb-0310-9956-ffa450edef68
2012-06-01 12:57:39 +00:00
Stefan Fritsch
a1b0be3dcb 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1343109 13f79535-47bb-0310-9956-ffa450edef68
2012-05-27 21:40:00 +00:00
Joe Orton
beaee8f4e3 suexec: Support use of setgid/setuid capability bits on Linux, a
weaker set of privileges than the full setuid/setgid root binary.

* configure.in: Add --enable-suexec-capabilites flag.

* Makefile.in: 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1342065 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 21:38:39 +00:00
Joe Orton
976fd1edc1 * configure.in: Use AC_MSG_NOTICE so passing --silent works as advertised.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1341913 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 15:51:14 +00:00
Joe Orton
cc9eab4c92 suexec: Add support for logging to syslog as an alternative to a
logfile.

* support/suexec.c (err_output) [AP_LOG_SYSLOG]: Log to syslog.
  (main): Close syslog fd if open, before execv.  Add -V output
  for AP_LOG_SYSLOG.

* configure.in: Add --with-suexec-syslog argument; allow
  --without-suexec-logfile to omit definition of AP_LOG_EXEC.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1341905 13f79535-47bb-0310-9956-ffa450edef68
2012-05-23 15:42:33 +00:00
Guenter Knauf
47f57ff536 Final step to make cross compilation working.
In case of cross compilation set CC_FOR_BUILD to cc unless
we got already CC_FOR_BUILD from environment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1328714 13f79535-47bb-0310-9956-ffa450edef68
2012-04-21 17:31:30 +00:00
Rainer Jung
2b47c1d3ba To early, not enough drugs, sorry for the noise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1243799 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 07:14:26 +00:00
Rainer Jung
969762d30e Fix out of tree build with srclib apr.
Fix error message for included apr flag.

Forward port of r1241897 and r1243670
from 2.4.x plus one shell syntax fix.

Will backport the fix to 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1243797 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 07:11:36 +00:00
Graham Leggett
bad70ddb3e configure: Move the --with-included-apr check so that srcdir!=builddir builds
aren't broken by it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232838 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 11:30:27 +00:00
Graham Leggett
a0930811c9 configure: Improve the error message when --with-included-apr is specified
but either APR or APR-Util is not included.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232575 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:12:19 +00:00
Graham Leggett
a03bcce31d mod_policy: Add a new testing module to help server administrators
enforce a configurable level of protocol compliance on their
servers and application servers behind theirs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1221668 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 10:42:34 +00:00
Philip M. Gollucci
0205c835c0 libapreq is not a bunch of C files now, no special configure magic required
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201374 13f79535-47bb-0310-9956-ffa450edef68
2011-11-13 00:21:45 +00:00
Rainer Jung
0ef5418db7 Set --enable-load-all-modules implicitely in
maintainer mode unless disabled explicitely.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201306 13f79535-47bb-0310-9956-ffa450edef68
2011-11-12 19:13:44 +00:00
Joe Orton
80765aa7fe A stab at libapreq build integration, still disabled by default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200715 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 03:01:33 +00:00
Philip M. Gollucci
02d93987f1 disable libapreq stuff until it works generically
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200695 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 02:18:48 +00:00
Philip M. Gollucci
afeaa44829 have libapreq install honor the top level layout options
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200594 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 22:09:44 +00:00
Philip M. Gollucci
83b7b317c4 hook up srclib/libapreq to the build system
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200590 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 21:59:07 +00:00
Nick Kew
da6343c864 Add default proxy-html.conf file (defines links to be rewritten
according to W3C HTML 4 and XHTML 1).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200060 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 00:23:30 +00:00
Rainer Jung
fc2ea4121c Load all modules in the generated default configuration
when using --enable-load-all-modules with configure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199467 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 21:25:28 +00:00
Stefan Fritsch
4a36c5ba4c By default, only load those modules that are either required
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
2011-11-08 00:20:24 +00:00
Stefan Fritsch
03227ed1c4 Add some CFLAGS in maintainer mode if supported by gcc:
-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
2011-10-08 07:48:01 +00:00
Stefan Fritsch
602791140b Revert r1129808:
Incorporate the ap_ldap incomplete API, as there is no interest or effort
    at APR to make this a complete abstraction, and it was voted 'off the island'
    with APR 2.0.  This will allow httpd 2.3 to build against either apr-2.0
    or apr+util 1.x.

This also reverts part of r1142938, which needs to be re-done.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150172 13f79535-47bb-0310-9956-ffa450edef68
2011-07-23 17:29:42 +00:00
Stefan Fritsch
533704a7fa Revert r1131393:
Several fixes for the ap_ldap build logic. This should fix compilation
    without --with-ldap.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150165 13f79535-47bb-0310-9956-ffa450edef68
2011-07-23 17:16:54 +00:00
Rainer Jung
c1197d4d83 Move PCRE_LIBS from HTTPD_LDFLAGS to
PROGRAM_LDADD.

Otherwise -lpcre comes before libmain which leads
to undefined recences during linking of httpd.

Followup to r1142739.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142893 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 05:48:24 +00:00
Rainer Jung
83a930d9a2 Line already contained in aclocal.m4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142742 13f79535-47bb-0310-9956-ffa450edef68
2011-07-04 17:13:42 +00:00