1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

71 Commits

Author SHA1 Message Date
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
Victor J. Orlikowski
5bb62837d1 Make sure httpd.exp gets cleaned up only with a distclean, and not every time.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89306 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 14:43:02 +00:00
Victor J. Orlikowski
b0272c1d37 (A few) Small changes to pass full paths instead of relatives.
One relative left; not sure whether to change it too or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89302 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 02:13:18 +00:00
Victor J. Orlikowski
d3feaed25f Generate httpd.exp on the fly.
This should allow DSOs to work on AIX, without the headache of maintaining
the httpd.exp file.
This is adapted from OS/2's generation of ApacheCoreOS2.def.
There exist a few bugs still:
    1) mod_dav and mod_proxy may not yet work, due to certain namespace issues.
    2) Some symbols may need to be added, a la core_header.def
Once these have been fixed, the old httpd.exp file will be deleted.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89288 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 10:03:29 +00:00
Jeff Trawick
7135d12e6c get rid of util_date.c/util_date.h and associated test program
test_date.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89278 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 19:37:15 +00:00
Roy T. Fielding
7f71ccede6 Leave the uri-related clean stuff here for a few weeks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89199 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 01:35:52 +00:00
Roy T. Fielding
43b9634ceb Moved util_uri to apr-util/uri/apr_uri, which means adding the apr_
prefix to all of the uri functions (yuck), changing some includes,
and using APR error codes instead of HTTP-specific error codes.

Other notes to test this patch:
- You need to delete the util_uri.h file - exports picks up on this.
- I'd like to remove the apr_uri.h from httpd.h, but that might
  increase the complexity of this patch even further.  Once this patch
  is accepted (in some form), then I can focus on removing apr_uri.h
  from httpd.h entirely.  I need baby steps (heh) right now.
- I imagine that this might break a bunch of stuff in Win32 or other OS
  builds with foreign dependency files.  Any help here is appreciated.

This is a start...  -- justin

Submitted by:	Justin Erenkrantz
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89198 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 01:31:12 +00:00
Roy T. Fielding
62367507a9 Change the make targets and rules to be consistent in all of the
Apache-owned source trees.  Sanity is a good thing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89140 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 00:48:57 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
Roy T. Fielding
efd42bd8a4 Make clean, distclean, and extraclean consistently according to the
Gnu makefile guidelines.

Submitted by: Justin Erenkrantz <jerenkrantz@ebuilt.com>
Reviewed by:  Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88809 13f79535-47bb-0310-9956-ffa450edef68
2001-04-11 06:44:07 +00:00
Brian Havard
4956c2de01 A few symbols from os.h need to be exported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88748 13f79535-47bb-0310-9956-ffa450edef68
2001-04-07 13:41:29 +00:00
Brian Havard
dea84b1a0b Switch to using aplibtool for building under OS/2 & add support for building
loadable modules as OS/2 DLLs.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88645 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 15:20:45 +00:00
Ryan Bloom
54ed3070d5 Another chunk of code from http to core. This should continue to build
on all platforms.  The next job is to shuffle functions back and forth
so that the server builds without mod_http.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88453 13f79535-47bb-0310-9956-ffa450edef68
2001-03-05 04:43:56 +00:00
Ryan Bloom
3eeeb76fb4 Move more code from the http module into the core server. This
is core code, basically the default handler, the default input
and output filters, and all of the core configuration directives.
All of this code is required in order for the server to work, with or
without HTTP.  The server is closer to working without the HTTP
module, although there is still more to do.

I tried to fix Windows, but somebody should probably make sure I did
it correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88449 13f79535-47bb-0310-9956-ffa450edef68
2001-03-04 06:27:27 +00:00
Ryan Bloom
4296146043 Begin to move functions from the http module to the core. The goal is to
have only functions that are HTTP specific in the http directory.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88341 13f79535-47bb-0310-9956-ffa450edef68
2001-02-26 04:38:22 +00:00
Ryan Bloom
ed157ba547 Move the error_bucket definition from the HTTP module to the core server.
Every protocol will need this definition, so it belongs in the core.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88318 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 04:24:17 +00:00
Roy T. Fielding
7b1b30525b Intermediate change of hardcoded "helpers" reference to "build"
until I get a chance to revamp this to use APR's variables directly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88230 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 16:07:31 +00:00
Ben Laurie
b758e0e297 Make exports.lo rebuild when it should.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88214 13f79535-47bb-0310-9956-ffa450edef68
2001-02-17 16:10:54 +00:00
Ryan Bloom
deab760727 Bring mod_status for 2.0 back in line with mod_status for 1.3. This is
basically a straight port of the 1.3 module to 2.0.  The MPMs need to be
modified a bit to work with mod_status, but prefork, mpmt_pthread, and
dexter have already been changed.  I will fix perchild tonight.  There
is a lot of common code that can be abstracted, and there seems to be a
small bug with regard to what mpmt_pthread and dexter report as current
connections.  ExtendedStatus does work again, although until the bug
mentioned above is fixed, it isn't as useful on mpmt_pthread and dexter.

Next week, I will look at allowing other modules to add data to the
STATUS page and possibly to the scoreboard itself.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87949 13f79535-47bb-0310-9956-ffa450edef68
2001-02-01 21:55:16 +00:00
dgaudet
644cc2eefc - add some missing distclean targets
- use DISTCLEAN_TARGETS and CLEAN_TARGETS everywhere (to be consistent
with other macros and with APR)
- warn that aclocal.m4 is a generated file


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87597 13f79535-47bb-0310-9956-ffa450edef68
2001-01-06 21:47:49 +00:00
Ben Laurie
1ca170d01b RM was not defined. Just use rm instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87559 13f79535-47bb-0310-9956-ffa450edef68
2000-12-31 11:35:50 +00:00
Greg Stein
05de3e2fca exports.c was dependent upon delete-exports, but that dependency will always
fail since there is no delete-exports file (thus, exports.c would always get
regenerated, recompiled, and relinked). Instead, we move the delete-exports
target "up" to the "all" target. However, ltlib.mk doesn't allow us to add
things to the "all" target, so we also revise the set of .mk files to use.

also use TARGET_EXPORTS consistently.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87449 13f79535-47bb-0310-9956-ffa450edef68
2000-12-20 10:19:06 +00:00
Ryan Bloom
c2141cda9e Correct a mistake in the delete-exports target
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87425 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 17:52:40 +00:00
Ryan Bloom
b5440c348a Force all Apache functions to be linked into the executable, whether they
are used or not.  This uses the same mechanism that is used for APR
and APR-util.  This may not be the correct solution, but it works, and that
is what I really care about.  This also renames CHARSET_EBCDIC to
AP_CHARSET_EBCDIC.  This is for namespace correctness, but it also makes
the exports script a bit easier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87424 13f79535-47bb-0310-9956-ffa450edef68
2000-12-19 17:05:48 +00:00
Greg Stein
b5de155f2a *) fix up buildexports.sh:
- enable it to be run from any dir by passing a parameter for the
     location of srclib, and using its own location for determining where
     the AWK script is located
   - accept exports files on STDIN, and produce output on STDOUT
   - use "pwd" and cd back to it, rather than assuming ../../.. (which might
     not apply if we feed it other export files)
   - add USAGE reporting

*) generate exports.c during normal build of "server" rather than during the
   buildconf stage. update invocation to match above changes

*) revamp the ap_ugly_hack referencing in main.c: put it at the bottom of
   the file with the other, similar references, and style it similarly.

*) remove the ap_ugly_hack declaration from http_main.h; it is internal to
   the "server" code


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87249 13f79535-47bb-0310-9956-ffa450edef68
2000-12-07 11:37:08 +00:00
Ryan Bloom
2c31dcf76a Apache builds again, although the test directory doesn't. I will work on
the test directory soon.  The server does NOT currently run, but it does
build cleanly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87192 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 02:45:50 +00:00
Ryan Bloom
b1e313ee47 Get base Apache to build properly. This doesn't solve the problem of
not having apr-util, but we should be getting to the link stage now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87190 13f79535-47bb-0310-9956-ffa450edef68
2000-12-05 00:36:09 +00:00
Ryan Bloom
8e4b48875b Remove buff.c and buff.h. There are still a few files that rely on these,
but those files are already broken.  This just makes that breakage more
obvious.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87171 13f79535-47bb-0310-9956-ffa450edef68
2000-12-04 06:36:16 +00:00
Ryan Bloom
511d2c481c This is an ugly little hack to allow DSO modules to work. This basically
forces Apache to link in all of the APR functions whether they are used
by any static modules or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86770 13f79535-47bb-0310-9956-ffa450edef68
2000-10-30 23:08:27 +00:00