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

117 Commits

Author SHA1 Message Date
Stefan Fritsch
639c26f54a Avoid using a tmpfile with fixed name when creating export_files, since this
is bad for parallel builds.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1131446 13f79535-47bb-0310-9956-ffa450edef68
2011-06-04 17:41:13 +00:00
Stefan Fritsch
aa6d4e927b test_char.h is a dependency, not a source. This seems to fix the occasional
"No rule to make target `server/test_char.h'" errors when doing a parallel
build.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1067525 13f79535-47bb-0310-9956-ffa450edef68
2011-02-05 21:09:12 +00:00
Stefan Fritsch
1bb69047c9 improve hack to not break if a fixed version of flex is used
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039546 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 20:10:55 +00:00
Stefan Fritsch
6166d5bf16 Remove some unused functions for which flex forgets to add prototypes, leading
to compiler warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039543 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 20:04:48 +00:00
Stefan Fritsch
35cdba6976 Replace ap_expr with a parser derived from mod_ssl's parser. Make mod_ssl use
the new parser. Rework ap_expr's public interface and provide hooks for modules
to add variables and functions.

The Netware and Windows build files still need to be adjusted


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032073 13f79535-47bb-0310-9956-ffa450edef68
2010-11-06 14:31:16 +00:00
Nick Kew
d4963eadb1 Introduce ap_rxplus class: higher-level regexps supporting perl-style
regexp operations.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@999533 13f79535-47bb-0310-9956-ffa450edef68
2010-09-21 18:42:20 +00:00
Brian Havard
60fbe11de1 Bring back OS/2 support.
Reverses r758929 with a little bit of conflict resolution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 08:56:13 +00:00
Jim Jagielski
d03dc3ead4 Final ( :) ) step to transition which removes the ap_slotmem_foo
API and just does providers direct


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775176 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 15:04:37 +00:00
Jeff Trawick
ee32468a33 remove OS/2 platform support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758929 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:47:52 +00:00
William A. Rowe Jr
0d19ef47cd refactor mpm_common.c into itself and mpm_unix.c for unix-specific quirks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758367 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 17:52:23 +00:00
Jim Jagielski
11719367b3 Transition mod_slotmem to ap_slotmem... just monkeying
with the locations, etc. now... adding getter/setter
will be over the weekend and post-2.3.1 but I figured
at least do this beforehand...

I love trunk :)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730597 13f79535-47bb-0310-9956-ffa450edef68
2009-01-01 20:17:56 +00:00
Sander Temme
baec0398aa No header files currently found in that dir, so the build fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664442 13f79535-47bb-0310-9956-ffa450edef68
2008-06-08 05:11:31 +00:00
Graham Leggett
7d5bef8273 mod_session_cookie: Add a session implementation capable of storing
session information within cookies on the browser. Useful for high
volume sites where server bound sessions are too resource intensive.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@644748 13f79535-47bb-0310-9956-ffa450edef68
2008-04-04 16:02:22 +00:00
Nick Kew
8f6e6a9726 Introduce ap_expr expression parser API
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@642558 13f79535-47bb-0310-9956-ffa450edef68
2008-03-29 17:13:28 +00:00
Jim Jagielski
707d1dabb9 Once SSLMutex allowed for the setting of both the
locking method and the lockfile location, I never
liked how AcceptMutex was linked to LockFile. This
seemed unnecessary. Much better to have AcceptMutex
do both as well. Plus, now that we will likely see
other modules require a "standard" way of setting
mutexes, why not have Apache provide that as
an API of sorts.

Anyway, LockFile is now depreciated and AcceptMutex
is now SSLMutex-like. We also provide a short
function that "parses" out a mutex parameter
and strips out the mechanism and lockfile location.
AcceptMutex and SSLMutex is this capability.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@467326 13f79535-47bb-0310-9956-ffa450edef68
2006-10-24 13:17:29 +00:00
Paul Querna
d26fded1ef gen_test_char doesn't actually need the util_debug object to work.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422306 13f79535-47bb-0310-9956-ffa450edef68
2006-07-15 22:36:12 +00:00
William A. Rowe Jr
34cb5fbc3f uri_delims moved to apr-util EONS ago.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@384622 13f79535-47bb-0310-9956-ffa450edef68
2006-03-09 21:29:20 +00:00
William A. Rowe Jr
d3e8acd0a5 Solaris build proposal; don't fail on missing .h files within
a VPATH build, and don't test trees with -d (simply -f the
  expected files) in case a tree such as srclib/apr is actually
  a symlink rather than a true directory in ./buildconf.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@374821 13f79535-47bb-0310-9956-ffa450edef68
2006-02-04 02:41:02 +00:00
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