1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-25 10:59:28 +03:00
Commit Graph

288 Commits

Author SHA1 Message Date
Joe Orton
2160d59157 * include/ap_config.h: Define AP_HAVE_DESIGNATED_INITIALIZER for GCC
(but not G++) or any compiler which claims C99 support.

* configure.in: Don't define AP_HAVE_DESIGNATED_INITIALIZER here.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@356234 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 10:10:33 +00:00
Joe Orton
c40db6cdcd * configure.in: Move apr/apr-util version checks later to fix in-tree
apr/apr-util build failures due to $EGREP not getting set early
enough.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@328852 13f79535-47bb-0310-9956-ffa450edef68
2005-10-27 10:40:59 +00:00
Joe Orton
aa23b6a5c4 * configure.in: Require apr >= 1.2.0 and apr-util >= 1.2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@328641 13f79535-47bb-0310-9956-ffa450edef68
2005-10-26 12:33:16 +00:00
André Malo
558abd49fa make mod_dbd.h available for all who need it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@321489 13f79535-47bb-0310-9956-ffa450edef68
2005-10-15 20:51:05 +00:00
Colm MacCarthaigh
a25aa220b6 Move the AC_TRY_RUN expansion much further down, after we have had a chance to
initialise the compile-environment for all platforms. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@295113 13f79535-47bb-0310-9956-ffa450edef68
2005-10-05 20:46:18 +00:00
Colm MacCarthaigh
4674da2cc7 One way or another, whether we leave the casts in or out, right now we are
using "void *" containers to store long integers; Add a configure-time check to
ensure that it is valid to assume that a "void *" container is large enough to
store a long int. See <200510031150.j93Boh700945@devsys.jaguNET.com> and
ensuing discussion on httpd-dev. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@294809 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 16:18:24 +00:00
Justin Erenkrantz
c2a9a985f8 Use rsync to install manual and htdocs to speed up installation times.
* Makefile.in: Update install-man and install-htdocs to use rsync if available,
  otherwise fail back to current cp -rp and rm -rf .svn/ strategy.
* configure.in: Look for rsync.
* acinclude.m4: Include RSYNC in exported config_vars.mk

(Incorporates suggestions on rsync flags from colm.)

Reviewed by: colm, trawick (concept), niq (concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@292718 13f79535-47bb-0310-9956-ffa450edef68
2005-09-30 13:01:39 +00:00
Colm MacCarthaigh
395896ae8d Remove support for the threaded-mpm's on Linux 2.0, and de-autoconf the
graceful restart signal. Frees up SIGWINCH for implementing graceful stop.
See <20050727114058.GA3390@stdlib.net> and subsequent thread on httpd-dev.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239430 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 16:41:17 +00:00
Joe Orton
f2f8515171 * configure.in: Define MKINSTALLDIRS and INSTALL in config_vars.mk.
Don't use AC_PROG_INSTALL since any system "install" command is never
used anyway.

* build/rules.mk.in: Remove fixed reference to install.sh and mkdir.sh
in abs_srcdir.

* build/config_vars.sh: Munge definitions of MKINSTALLDIRS and INSTALL
to use installed scripts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190396 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 13:19:42 +00:00
Joe Orton
b8274244fa Sanitize the installed config_vars.mk to remove references to the
build and source directories, and to remove variables which are
internal to the httpd build system:

* build/config_vars.sh.in: New file.

* Makefile.in (build/config_vars.out): New target.
(install-build): Install build/config_vars.out as config_vars.mk.

* configure.in: Add include path for srclib/pcre to INCLUDES rather
than CPPFLAGS, and use a topdir-relative not absolute path name.
Generate build/config_vars.sh.

Reviewed by: Paul Querna
PR: 20874, 28145


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190392 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 12:49:58 +00:00
Joe Orton
a6e3e88968 * configure.in: Disallow use of bundled APR with external APR-util, or
bundled APR-util with external APR, another cause of the dreaded
PR21718.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170029 13f79535-47bb-0310-9956-ffa450edef68
2005-05-13 14:44:21 +00:00
Joshua Slive
fa4e866600 Merged the simple-conf branch changes r159781:160695 into the trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160696 13f79535-47bb-0310-9956-ffa450edef68
2005-04-09 16:59:15 +00:00
Joe Orton
502606508c Support use of an external copy of the PCRE library:
* configure.in: Set abs_{builddir,srcdir} higher.  Add --with-pcre
flag; build against external PCRE library if used.

* Makefile.in (install-include): Don't install pcre headers any more.

* srclib/Makefile.in (SUBDIRS): Remove.

PR: 27550 (part two)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153400 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 14:08:24 +00:00
Joe Orton
a0570c8746 Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:

* configure.in: Add srclib/pcre to the include path.

* include/ap_regex.h: Renamed from include/pcreposix.h.  Prefix all
constants with AP_; prefix all functions and types with ap_.  Define
AP_DECLARE to nothing if necessary.  Remove regcomp error codes.

* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.

* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types.  (ap_regexec, ap_regerror): Removed.

* server/Makefile.in: Build util_pcre.c.

* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above.  Use APR includes.  (ap_regerror): Use apr_snprintf.

* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.

* modules/*: Update to use new type and constant names.

PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:00:41 +00:00
Joe Orton
81f2150298 * configure.in: Add --enable-pie flag; define PICFLAGS and PILDFLAGS.
* build/rules.mk.in: Factor out BASE_CC and BASE_CXX from COMPILE.
Substitute PICFLAGS into COMPILE and CXX_COMPILE, but not into
{SH,LT}{,_CXX}_COMPILE.  Substitute PILDFLAGS into LINK but not
{SH,MOD}_LINK.

Reviewed by: jerenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@126362 13f79535-47bb-0310-9956-ffa450edef68
2005-01-25 10:17:51 +00:00
Justin Erenkrantz
5d4ce7fb94 Fix VPATH errors introduced in r124104.
* configure.in: Use correct source path to get-version.sh and include/ dir.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125087 13f79535-47bb-0310-9956-ffa450edef68
2005-01-13 18:36:23 +00:00
Graham Leggett
ab4d018d62 Add a build script to create a solaris package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124104 13f79535-47bb-0310-9956-ffa450edef68
2005-01-04 13:38:11 +00:00
Brian Havard
8b62fcf936 The current config.guess in APR outputs i386-pc-os2-emx on OS/2 rather than
i386-pc-os2_emx (dash instead of underscore), adjust the tests to match.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@122967 13f79535-47bb-0310-9956-ffa450edef68
2004-12-21 12:52:17 +00:00
Joe Orton
1cc4147c80 * configure.in: Only export CC and CPP if a cache file is not
specified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105230 13f79535-47bb-0310-9956-ffa450edef68
2004-09-21 20:04:51 +00:00
Joe Orton
24713ca7b8 * configure.in: Ensure that $CC and $CPP are correctly passed through
to the pcre configure script if config caching is disabled (the
autoconf 2.5x default).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105210 13f79535-47bb-0310-9956-ffa450edef68
2004-09-20 12:12:01 +00:00
Paul Querna
75e27e14df Echo a warning from configure if you select an
experimental MPM.
Reviewed by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105003 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 14:10:58 +00:00
Joe Orton
58534ea246 * configure.in: Only build against APR 1.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104936 13f79535-47bb-0310-9956-ffa450edef68
2004-09-02 17:29:13 +00:00
Joe Orton
3dcd1d7164 * configure.in: Ensure that apr and apr-util exported include
directories are later than local source directories in INCLUDES.

PR: 18959


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104647 13f79535-47bb-0310-9956-ffa450edef68
2004-08-13 12:35:47 +00:00
Joe Orton
d32d0e376c * configure.in: Define AP_HAVE_DESIGNATED_INITIALIZER via ap_config.h
so third-party modules don't have to pick up NOTEST_CPPFLAGS to avoid
gcc warnings from http_config.h.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104642 13f79535-47bb-0310-9956-ffa450edef68
2004-08-13 11:18:33 +00:00
Joe Orton
84b6512fc8 * configure.in, acinclude.m4: Substitute AP[RU]_CONFIG with location
of installed ap[ru]-config scripts so third-party modules can use
`apxs -q APR_CONFIG`.

* support/apxs.in: Use new AP[RU]_CONFIG variables; use apr-config
--apr-libtool.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104641 13f79535-47bb-0310-9956-ffa450edef68
2004-08-13 09:38:11 +00:00
Justin Erenkrantz
252e7ae86c Teach apxs how to find ap{ru}-$AP{RU}_MAJOR_VERSION-config
(httpd-2.1+ will be APR 1.0 or higher which uses this convention.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104443 13f79535-47bb-0310-9956-ffa450edef68
2004-08-02 02:38:16 +00:00
Justin Erenkrantz
0d4387dedc Workaround RHEL 3 'cuteness' for OpenSSL by calling pkg-config openssl.
For more info, see: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=82369


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104329 13f79535-47bb-0310-9956-ffa450edef68
2004-07-19 04:27:13 +00:00
André Malo
7accf16eed Nobody objected:
<IfModule> now takes the module identifier in addition to the
filename.

CAUTION: this commit breaks the build on netware. It still needs
to be adjusted. (but I don't have any netware knowledge...)
Also, developers need to re-run buildconf on unices.

PR: 29003
Submitted by: Edward Rudd <eddie omegaware.com>, Andr� Malo


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103849 13f79535-47bb-0310-9956-ffa450edef68
2004-06-04 22:40:47 +00:00
Jeff Trawick
4d8f4c26d6 *) SECURITY: CAN-2004-0174 (cve.mitre.org)
Fix starvation issue on listening sockets where a short-lived
     connection on a rarely-accessed listening socket will cause a
     child to hold the accept mutex and block out new connections until
     another connection arrives on that rarely-accessed listening socket.
     With Apache 2.x there is no performance concern about enabling the
     logic for platforms which don't need it, so it is enabled everywhere
     except for Win32.  [Jeff Trawick]

(already in 2.0.49, propagating to mirrors now)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103029 13f79535-47bb-0310-9956-ffa450edef68
2004-03-19 11:16:03 +00:00
Joe Orton
ab526beefa * configure.in: Remove long since unnecessary endianness checks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102530 13f79535-47bb-0310-9956-ffa450edef68
2004-02-07 00:27:36 +00:00
Joe Orton
5fd58eab4b * configure.in: Remove unnecessary $builddir/server/mpm/$mpm and
$srcdir from INCLUDES.  Remove unused USE_VPATH variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102406 13f79535-47bb-0310-9956-ffa450edef68
2004-01-26 09:18:36 +00:00
Joe Orton
a8a954f27b * configure.in: Check for sqrt in libm (needed by ab).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102146 13f79535-47bb-0310-9956-ffa450edef68
2004-01-02 23:42:47 +00:00
Jeff Trawick
8d0f256131 Add fatal exception hook for use by debug modules. The hook is only
available if the --enable-exception-hook configure parm is used.

Sample users at http://httpd.apache.org/~trawick/exception_hook.html


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101899 13f79535-47bb-0310-9956-ffa450edef68
2003-11-26 03:45:34 +00:00
Cliff Woolley
05bbc35eb0 "Listen 80" just works now, using v4-only, v6-only, mapped address
or non-mapped address.

Submitted by:	Colm MacCarthaigh <colm@stdlib.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101337 13f79535-47bb-0310-9956-ffa450edef68
2003-09-28 16:27:24 +00:00
Joe Orton
f1ba7c37fb Add optional hook to extend mod_status output.
* configure.in: Add modules/generators to include path.

* Makefile.in: Install mod_status.h.

* modules/generators/mod_status.h: New file.

* modules/generators/mod_status.c: Implement ap_run_status_hook.
(status_handler): Run status hooks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100724 13f79535-47bb-0310-9956-ffa450edef68
2003-07-21 14:48:02 +00:00
Joe Orton
30333b82cc Use three-argument form of AC_DEFINE everywhere; remove acconfig.h
and the warning message from autoconf 2.5x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100540 13f79535-47bb-0310-9956-ffa450edef68
2003-07-10 19:29:24 +00:00
Wilfredo Sanchez
a3ffe113fe Play nice with libtool 1.5.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99926 13f79535-47bb-0310-9956-ffa450edef68
2003-05-19 16:10:14 +00:00
William A. Rowe Jr
6efb804270 Fix a VPATH build issue - our command lines can sometimes hit the wall
against the shell's max command line length.  We had a number of needless
  paths included in VPATH builds; this change will spare us from -I'ncluding
  the module paths with no .h files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99861 13f79535-47bb-0310-9956-ffa450edef68
2003-05-16 16:01:11 +00:00
Thom May
b7936f0788 Ensure that ssl-std.conf is generated at configure time, and switch
to using the expanded config variables to work the same as httpd-std.conf

PR: 19611


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99719 13f79535-47bb-0310-9956-ffa450edef68
2003-05-05 13:12:28 +00:00
Jeff Trawick
f5641ccf0f By default, use the same CC and CPP with which APR was built.
The user can override with CC and CPP environment variables.

This applies to out-of-tree APR builds.  Prior to this change,
if you had multiple compilers on the system and you told
APR to use a non-default one, you'd have to remember to tell
Apache too.  Otherwise, Apache would use the default compiler
but use CFLAGS that went with the compiler that APR was built
with.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99572 13f79535-47bb-0310-9956-ffa450edef68
2003-04-24 13:19:00 +00:00
Justin Erenkrantz
54d92feb12 Move the dropped '--enable-layout' subdir logic into APR_SUBDIR_CONFIG macro
as a third parameter rather than manually computing it ourselves.

Add the ' prefix'd --enable-layout so that this can work with an autoconf-2.54+
generated configure.  (Previously, the option would not be dropped with 2.54
or 2.57 since it unconditionally adds single-quotes which our case statement
would not catch.)

Try to shorten long invocations of APR_SUBDIR_CONFIG where possible.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99257 13f79535-47bb-0310-9956-ffa450edef68
2003-04-05 21:46:40 +00:00
Jeff Trawick
de79301934 Fix a build problem with passing unsupported --enable-layout
args to apr and apr-util.  This broke binbuild.sh as well as
user-specified layout parameters.

PR:                                  18649
Original concept code submitted by:  Justin Erenkrantz
Mangled by:                          Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99188 13f79535-47bb-0310-9956-ffa450edef68
2003-04-03 11:52:08 +00:00
Jeff Trawick
a2d2ae5a57 use APR_CHECK_APR_DEFINE() where possible
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98947 13f79535-47bb-0310-9956-ffa450edef68
2003-03-08 13:54:41 +00:00
Greg Ames
b906d05f70 Linux 2.4+: enable coredumps when Apache is started as root if
CoreDumpDirectory is explicitly coded


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98908 13f79535-47bb-0310-9956-ffa450edef68
2003-03-06 21:48:58 +00:00
Justin Erenkrantz
5abd018c41 Use APR_LAYOUT instead of APACHE_LAYOUT in configure.
(We need a bug fix in this code, so let's merge the macro first.)

PR: 15679


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98685 13f79535-47bb-0310-9956-ffa450edef68
2003-02-17 02:32:20 +00:00
Justin Erenkrantz
d2ba87a5d7 Remove files on 'make distclean' that should be.
PR: 15592


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98684 13f79535-47bb-0310-9956-ffa450edef68
2003-02-17 01:04:40 +00:00
Justin Erenkrantz
92e7b7651f Use correct quoting mechanism for APR_SUBDIR_CONFIG.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98675 13f79535-47bb-0310-9956-ffa450edef68
2003-02-15 17:56:01 +00:00
Justin Erenkrantz
97326be0eb Allow apachectl to perform status with links and elinks as well if lynx is
not available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98674 13f79535-47bb-0310-9956-ffa450edef68
2003-02-15 17:51:44 +00:00
Jeff Trawick
6c9c376cd5 update a test compile to find apr.h when apr isn't in srclib
(the only one of several such places in Apache which
didn't get fixed to work with separate APR...  no fun
when v4 sockets won't talk to Apache anymore)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98595 13f79535-47bb-0310-9956-ffa450edef68
2003-02-07 20:28:41 +00:00
Justin Erenkrantz
f65755faf2 Make buildconf work with out-of-tree apr and apr-util by adding --with-apr
and --with-apr-util flags.

Submitted by:   Thom May <thom@planetarytramp.net>
Reviewed by:    Justin Erenkrantz (with minor stylistic nit)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98546 13f79535-47bb-0310-9956-ffa450edef68
2003-01-30 16:50:11 +00:00