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

99 Commits

Author SHA1 Message Date
Brian Pane
158559eacb Redesign of request cleanup and logging to use End-Of-Request bucket
(backport from async-dev branch to 2.3 trunk)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327925 13f79535-47bb-0310-9956-ffa450edef68
2005-10-24 02:39:49 +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
Justin Erenkrantz
e578d12e60 Only recompile buildmark.c when we have to relink httpd.
This allows us to be able to do a make on an up-to-date tree without forcing
a recompile and relink.  Yay!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153266 13f79535-47bb-0310-9956-ffa450edef68
2005-02-10 15:32:05 +00:00
Justin Erenkrantz
47d2261318 Fix --with-apr=/usr and/or --with-apr-util=/usr.
PR: 29740
Submitted by: Max Bowsher <maxb ukf.net>
Reviewed by:  Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151255 13f79535-47bb-0310-9956-ffa450edef68
2005-02-03 23:39:21 +00:00
Justin Erenkrantz
439221058c Initial pass at refactoring some files to eliminate our 150K C source behemoths.
* Makefile.in: Change order of dependencies to bring in exports.o first so that
  we have every symbol 'used' before the linker starts processing.
* build/rules.mk.in: Add a 'program-install' target which just copies httpd.

* server/Makefile.in, modules/http/config2.m4: Add in new file targets.

* NWGNUmakefile, libhttpd.dsp: Blind updates for Netware and Win32.  (I tried.)

* server/core.c: Move core_input_filter, net_time_filter, and core_output_filter  and all supporting functions to...
* server/core_filters.c (copied): ...here.

* modules/http/http_protocol.c: Move functions from here to there...namely:
* modules/http/byterange_filter.c (copied): Relocate ap_byterange_filter() and
  friends.
* modules/http/chunk_filter.c (copied): Relocate chunk_filter().
* modules/http/http_etag.c (copied): Relocate ap_set_etag and ap_make_etag().
* modules/http/http_filters.c (copied): Relocate ap_http_filter(),
  ap_http_header_filter(), ap_discard_request_body(), ap_setup_client_block(),
  ap_should_client_block(), and ap_get_client_block().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106692 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 08:07:44 +00:00
Joe Orton
1824537d9e * server/Makefile.in: Revert duplicate eoc_bucket.c in
LTLIBRARY_SOURCES.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102973 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 21:49:35 +00:00
Martin Kraemer
8a84df6e6a Add missing source
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102964 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 20:19:00 +00:00
Madhusudan Mathihalli
5fc3ea3da9 Include the new eoc_bucket.c for compilation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102794 13f79535-47bb-0310-9956-ffa450edef68
2004-02-28 00:48:28 +00:00
Joe Orton
3978e59548 * server/Makefile.in: Remove buildmarked.c from clean.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102484 13f79535-47bb-0310-9956-ffa450edef68
2004-02-02 17:04:10 +00:00
Jeff Trawick
450089c293 Delete some make-generated files in the server directory during
"make clean" processing.

PR:		26552


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102483 13f79535-47bb-0310-9956-ffa450edef68
2004-02-02 16:39:12 +00:00
Joe Orton
8787f61c2b * server/Makefile.in: Simpler fix to ensure that buildmark.lo is
always regenerated: remove buildmark.lo in delete-exports.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102380 13f79535-47bb-0310-9956-ffa450edef68
2004-01-19 20:54:48 +00:00
Joe Orton
59ddeafec6 Fix regeneration of build datestamp on every make invocation (a
regression since 1.3).

* Makefile.in: Remove redundant PHONY_TARGETS setting.

* server/Makefile.in: Mark buildmark.c as phony; build it indirectly
via buildmarked.c since implicit rules are ignored for phony targets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102243 13f79535-47bb-0310-9956-ffa450edef68
2004-01-09 12:19:55 +00:00
Joe Orton
d2cf3cc260 * server/Makefile.in: Revert changes to use an absolute path to
exports.c in some (but not all) places, and subsequent fallout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102013 13f79535-47bb-0310-9956-ffa450edef68
2003-12-10 15:59:16 +00:00
Justin Erenkrantz
2d2abfe420 Add .NOTPARALLEL target for exports.c. This allows a parallel make build to
complete successfully.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99280 13f79535-47bb-0310-9956-ffa450edef68
2003-04-06 19:59:02 +00:00
Justin Erenkrantz
91c8f44478 Rework the delete-exports target once more. Leave a comment there explaining
why we have to be complicated.  (Why make's dependency code doesn't catch this,
I don't know.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98683 13f79535-47bb-0310-9956-ffa450edef68
2003-02-17 01:00:50 +00:00
Justin Erenkrantz
c57c7fcc71 Fix typo in echo statement.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98519 13f79535-47bb-0310-9956-ffa450edef68
2003-01-28 18:51:57 +00:00
Justin Erenkrantz
86b3519656 Throw out export_files if exports.c is out-of-date as well.
This should remove the requirement to run extraclean when we change a header
file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98518 13f79535-47bb-0310-9956-ffa450edef68
2003-01-28 18:50:02 +00:00
André Malo
fe5980e409 move rfc1413 code to a new module "metadata:mod_ident".
The rfc1413 code itself is mostly c&p, but can still bear
some rework ...

This patch removes the global ap_rfc1413 function and the
ap_rfc1413_timeout variable. It also introduces a new config
directive IdentityCheckTimeout (default 30 sec).

Reviewed by: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98320 13f79535-47bb-0310-9956-ffa450edef68
2003-01-18 03:37:55 +00:00
Justin Erenkrantz
f51a3c83cc Ah, we don't even need the 'ls -1' - 'ls' suffices.
Submitted by:	Ben Laurie


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97897 13f79535-47bb-0310-9956-ffa450edef68
2002-12-12 17:11:02 +00:00
Justin Erenkrantz
b02ac00347 Take a stab at fixing the brokenness in our tree (grr!).
ls -1 is bound to be more portable than find -maxdepth, but I suspect it may
not be as portable as it really should.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97864 13f79535-47bb-0310-9956-ffa450edef68
2002-12-11 21:09:16 +00:00
Martin Kraemer
ef6878fdab FreeBSD's make doesn't like the 'implied source' syntax ($<) -- using $? which works.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97767 13f79535-47bb-0310-9956-ffa450edef68
2002-12-03 09:47:11 +00:00
Martin Kraemer
38efddbeb9 If this worked on Mac OS-X, then OS-X should be fixed ;-)
Otherwise, it looks like Apache-2.x has not been compiled on any unixoid platform
anywhere since 2002-Nov-29


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97731 13f79535-47bb-0310-9956-ffa450edef68
2002-12-02 13:36:49 +00:00
Wilfredo Sanchez
e4b9203858 Add export_files to EXTRACLEAN_TARGETS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97675 13f79535-47bb-0310-9956-ffa450edef68
2002-11-29 08:07:20 +00:00
Wilfredo Sanchez
9018dc55c1 If apr and apr-util are not in-tree, we need to be able to find the
include directory for each in order to generate the server/exports.c
and server/export_vars.h files.

configure.in:
 - Provide APR_INCLUDEDIR, APU_INCLUDEDIR.

server/Makefile.in:
 - Use $APR_INCLUDEDIR $APU_INCLUDEDIR vars.
 - Add export_files target to generate a list of headers with symbols
 to export, use that list to generate exports.c and export_vars.h.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97672 13f79535-47bb-0310-9956-ffa450edef68
2002-11-29 07:21:07 +00:00
Justin Erenkrantz
f0f384c2cc Fix recent exports.c breakage by referencing exports.c as being in
top_builddir rather than top_srcdir.

For VPATH builds, we must treat exports.c as being in the build tree rather
than in the source tree.  Otherwise, it won't be regenerated properly.

(FreeBSD's make does not require the explicit path, so I'm not sure why this
change was made at all.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97144 13f79535-47bb-0310-9956-ffa450edef68
2002-10-08 15:12:43 +00:00
Jeff Trawick
62d6bb33f4 the recent change to fully-qualify exports.c to fix the build with
some BSD make broke the build for AIX make...  fully-qualifying exports.c
in LTLIBARY_SOURCES makes it build again


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96989 13f79535-47bb-0310-9956-ffa450edef68
2002-09-27 16:20:17 +00:00
Ben Laurie
ed40fffee0 Full path required for BSD make (haven't I done this before???).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96985 13f79535-47bb-0310-9956-ffa450edef68
2002-09-26 12:52:13 +00:00
Justin Erenkrantz
7efe307731 Add ap_register_provider and ap_lookup_provider functions which resolve
the DSO link problems for DAV and the new aaa modules by moving the
provider code into the core of the server and generalizing them to be
used by any code.

Remove the auth{nz}_*_provider functions as they are no longer needed.

Change the dav_*_provider functions to wrap the ap_*_provider functions
as they have a bit more of a historical precedent that we should keep
around.

Reviewed by:	John K. Sterling <john@sterls.com> (in concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96919 13f79535-47bb-0310-9956-ffa450edef68
2002-09-20 00:57:50 +00:00
Jeff Trawick
51fde2472b get proxy-as-DSO to load on AIX by fixing up some of our symbol grokking
make_exports.awk didn't handle AP_CORE_DECLARE and it didn't look in
modules/http/*.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92548 13f79535-47bb-0310-9956-ffa450edef68
2001-12-20 16:19:50 +00:00
Jeff Trawick
b5e6cc0b8f Get shared builds of libapr and libaprutil, as well as Apache DSOs,
working on AIX.

Submitted by: a cast of many, reverse engineering libtool to
              figure out how to work around its oddities/limitations/
              bugs on AIX
              (Jeff Trawick coded these changes but it took a lot of
              help)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92276 13f79535-47bb-0310-9956-ffa450edef68
2001-12-01 17:42:18 +00:00
Aaron Bannert
f5ae27eb70 These files were already defined in EXPORT_FILES, so reuse them.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91548 13f79535-47bb-0310-9956-ffa450edef68
2001-10-18 18:35:18 +00:00
Victor J. Orlikowski
0215683198 Removed outdated apache.exports references
Submitted by: Aaron Bannert <aaron@clove.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91472 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 21:58:04 +00:00
Justin Erenkrantz
867166bede The call to apr_explode_localtime() in mod_log_config is one of the more
expensive operations in the httpd.  This patch attempts to reduce the
overhead by caching the result for 15 seconds.

Submitted by:	Brian Pane <bpane@pacbell.net>
Reviewed by:	Cliff Woolley, Ryan Bloom, Dean Gaudet, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91083 13f79535-47bb-0310-9956-ffa450edef68
2001-09-19 06:53:26 +00:00
Ryan Bloom
73f768d207 rules.mk is stored in $(top_blddir). Without this change, VPATH builds
stop working.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91017 13f79535-47bb-0310-9956-ffa450edef68
2001-09-13 06:49:09 +00:00
Jeff Trawick
698d94586f fix check for newer header files to look in all relevant
directories


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90212 13f79535-47bb-0310-9956-ffa450edef68
2001-08-16 13:01:52 +00:00
Jeff Trawick
84b082481e Tweak server/Makefile so that the rules for generating exports.c
are compatible with make utilities which don't expand wildcards
in a dependency list (e.g., OS/390 make, certain levels of GNU
make).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90167 13f79535-47bb-0310-9956-ffa450edef68
2001-08-15 14:06:27 +00:00
Brian Havard
fa74775bd3 OS/2: get canonical filename functions exported from the core.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89698 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 02:14:39 +00:00
Ryan Bloom
fcaa0f5620 Improve the exports generating awk script. In the past, we had
work around problems in the awk script by avoiding some #if and
#ifdefs.  This has bitten us many times in generating the exports.c
file.  This improvement allows corrects the header file parsing.

Submitted by:	Sander Striker <striker@apache.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89647 13f79535-47bb-0310-9956-ffa450edef68
2001-07-21 06:34:54 +00:00
Ryan Bloom
8441f05fd9 Allow all parts of Apache 2.0 to build when --srcdir is used. This
required exposing a build directory and a source directory to all parts
of Apache's build system.  It also required a small hack in APR-util, if
we are using the bundled Expat, and we are using VPATH support, then we
have hard-coded the xml/expat location.  I couldn't figure out how to
allow the configure script to determine the correct location.  I added a
comment, but if somebody else figures it out, we should fix that at some
point.

PR:	7630


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89517 13f79535-47bb-0310-9956-ffa450edef68
2001-07-09 02:31:09 +00:00
Jeff Trawick
bc3508337c hide the generation of the httpd.exp header from the build messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89431 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 17:11:52 +00:00
Brian Havard
041c1cc9ae OS/2: Automate export of global variables from core.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89376 13f79535-47bb-0310-9956-ffa450edef68
2001-06-16 04:00:50 +00:00
Victor J. Orlikowski
206c3f2700 Clean up formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89347 13f79535-47bb-0310-9956-ffa450edef68
2001-06-11 23:43:22 +00:00
Victor J. Orlikowski
0953339d3c Document the fact that this is now an autogenerated file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89334 13f79535-47bb-0310-9956-ffa450edef68
2001-06-11 17:52:37 +00:00
Victor J. Orlikowski
2f16b9f3b8 Make this little hack slightly more palatable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89321 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 08:28:08 +00:00
Victor J. Orlikowski
6126dd3289 Still needs to be built, though.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89320 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 08:20:11 +00:00
Victor J. Orlikowski
415ae0aa07 No, libtool shouldn't build this. :p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89319 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 08:16:14 +00:00
Victor J. Orlikowski
37e2ad570b xlC isn't as accepting as gcc; make things tolerable for it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89318 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 08:06:38 +00:00
Victor J. Orlikowski
c2eed71a52 Add the missing AP[RU]_DECLARE_DATA symbols to httpd.exp.
httpd.exp should now be generated automatically.
Any missing symbols are now the fault of awk scripts.
Or rather, their authors. :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89316 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 06:33:50 +00:00
Victor J. Orlikowski
8040c4ad75 Clean up this relative path too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89312 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 20:36:09 +00:00
Victor J. Orlikowski
dd5aea1264 DISTCLEAN, not EXTRACLEAN.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89307 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 14:49:20 +00:00