1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Commit Graph

161 Commits

Author SHA1 Message Date
Jeff Trawick
3d34976f3d tag a few of the key httpd pools
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92519 13f79535-47bb-0310-9956-ffa450edef68
2001-12-18 20:26:15 +00:00
Jeff Trawick
638228a804 hmmm... gcc 2.95.2 on AIX says sizeof is long... fix up
a printf to always have a match between the format string
and argument


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92339 13f79535-47bb-0310-9956-ffa450edef68
2001-12-05 15:41:25 +00:00
Jeff Trawick
83c1a870b3 tweak httpd -V output to show the architecture (bits in a pointer)
and whether or not APR_HAS_SENDFILE is defined


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92322 13f79535-47bb-0310-9956-ffa450edef68
2001-12-04 18:36:51 +00:00
Ben Laurie
ed6f86a314 Handle the ? option.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92296 13f79535-47bb-0310-9956-ffa450edef68
2001-12-03 14:28:39 +00:00
William A. Rowe Jr
259c861166 Finish undoing that last patch... previous commit simply cleaned it up,
I was working with an unsaved verison when I pushed the button.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92246 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 07:30:49 +00:00
William A. Rowe Jr
df539edda8 Revert my last patch to detect a 'leftover' arg. Apparently there is
no way to distinguish between an extra arg, and a -x foo arg, or else
  our getopt is broken at the moment.

  I can't dig further into getopt right now, so this will wait for another
  day or another hacker to resolve.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92243 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 07:27:57 +00:00
William A. Rowe Jr
0f6e70ed8d We never tested for invalid 'additional' arguments that were ignored.
Was there any point to allowing additional, unused args after the
  various supported switches?

  This prevents the Apache server from starting with an httpd somefooness
  invocation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92241 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 07:10:40 +00:00
Doug MacEachern
bcb88ba28a carry over from 1.3: disable profiling in the parent process #ifdef GPROF
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92230 13f79535-47bb-0310-9956-ffa450edef68
2001-11-29 04:06:05 +00:00
Ian Holsman
c7c6e876a9 change open_logs hook to return a value, allowing you to flag a error
while opening logs

Obtained from: Doug MacEachern


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92149 13f79535-47bb-0310-9956-ffa450edef68
2001-11-24 00:08:30 +00:00
Ian Holsman
86b792b21c Modify post_config hook so that it can return a error,
causing the server not to start.
previous method was to call exit(1) which would not fail
gracefully

PR:
Obtained from:
Submitted by:
Reviewed by:	(Idea only Jeff Trawick)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92144 13f79535-47bb-0310-9956-ffa450edef68
2001-11-23 16:35:22 +00:00
William A. Rowe Jr
e11c9604fe Debug conf pool constness. This is a noop most of the time on most
platforms, but it's only called twice per restart, so this is mostly
  harmless.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91178 13f79535-47bb-0310-9956-ffa450edef68
2001-09-28 15:24:34 +00:00
Justin Erenkrantz
3c90c3f5f4 Add -X functionality back to httpd.
- Updates upgrading.html
- Reverts Aaron's earlier docco patch (sorry...)
- Adds -X to all mpms in the tree


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90824 13f79535-47bb-0310-9956-ffa450edef68
2001-08-30 20:50:06 +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
Jeff Trawick
7a7b869fe1 Fix command-line processing so that if a bad argument is specified
Apache will exit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89150 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 11:42:10 +00:00
Victor J. Orlikowski
8735167a29 Module writers for 2.0 shouldn't still be relying on a no-op for
compatibilities' sake. Let's kill ap_util_uri_init, since it serves no
purpose now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88716 13f79535-47bb-0310-9956-ffa450edef68
2001-04-04 07:15:35 +00:00
Greg Stein
4f28702c9c clean out some old crud from ap_config.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88296 13f79535-47bb-0310-9956-ffa450edef68
2001-02-24 03:40:50 +00:00
Doug MacEachern
24e2ea6b10 remove ap_{post_config,child_init}_hook
replace usage with ap_run_{post_config,child_init}
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88291 13f79535-47bb-0310-9956-ffa450edef68
2001-02-23 18:17:19 +00:00
Martin Kraemer
50e130018f Oops - better *think* first. Fix typo.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88261 13f79535-47bb-0310-9956-ffa450edef68
2001-02-21 13:35:34 +00:00
Martin Kraemer
d11e542955 Display APACHE_MPM_DIR in the list of #defines, and
remove the duplicate APR_HAS_MMAP test.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88260 13f79535-47bb-0310-9956-ffa450edef68
2001-02-21 13:34:51 +00:00
Doug MacEachern
18f173e918 rename miss: s/apr_clear_pool/apr_pool_clear/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88232 13f79535-47bb-0310-9956-ffa450edef68
2001-02-19 02:06:58 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
Greg Stein
1229603b02 *) remove some obsolete/unused defines from httpd.h.
*) remove DEFAULT_XFERLOG from main.c; it is never set/used
*) move ap_get_max_daemons() to ap_mpm.h
*) move DEFAULT_LISTENBACKLOG to mpm_common.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88103 13f79535-47bb-0310-9956-ffa450edef68
2001-02-12 02:49:56 +00:00
Greg Stein
bb282b75f7 Clean up some of the includes:
- explicitly include apr_lib.h since ap_config.h doesn't
- use apr_want.h where possible
- use APR_HAVE_ where possible
- remove some unneeded includes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88060 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 13:05:29 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
Ben Laurie
cf649a9b64 Add support for type-safe optional functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87868 13f79535-47bb-0310-9956-ffa450edef68
2001-01-27 17:50:47 +00:00
Ryan Bloom
0871a72f11 Back out the last change (the one that went in without a commit log)
I thought this change was necessary to stop reporting the SERVER_VERSION
twice.  In reality, the apr_hook_deregister_all() call in
ap_clear_module_list solved that problem.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87776 13f79535-47bb-0310-9956-ffa450edef68
2001-01-21 05:26:45 +00:00
Ryan Bloom
d852f27bfa PR:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87775 13f79535-47bb-0310-9956-ffa450edef68
2001-01-21 05:23:22 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
William A. Rowe Jr
de65e8cd0e Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.

  This needs further review, it's committed only as a stopgap for those
  who's builds I broke, sorry.  Review tbc late this evening.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87699 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 22:04:45 +00:00
Jeff Trawick
a65b522fb9 Set up stderr logging explictly early in initialization so that a pool is
available for creating the APR representation of stderr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87583 13f79535-47bb-0310-9956-ffa450edef68
2001-01-04 18:22:50 +00:00
Ryan Bloom
821dee4c85 Remove AP_USE_MMAP_FILES, it doesn't really control anything anymore. Now
we just use APR_HAS_MMAP directly, just like APR-util does.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87564 13f79535-47bb-0310-9956-ffa450edef68
2001-01-01 00:36:46 +00:00
Jeff Trawick
351725e726 Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87460 13f79535-47bb-0310-9956-ffa450edef68
2000-12-20 16:44:01 +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
Ryan Bloom
ab3721d8e2 Get -t -D DUMP_VHOSTS working and properly documented. This removes the
-S option from the docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87391 13f79535-47bb-0310-9956-ffa450edef68
2000-12-17 22:47:32 +00:00
Jeff Trawick
fb4cd95270 Display whether or not APR (and thus Apache) supports IPv6 in the
httpd -V output.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87368 13f79535-47bb-0310-9956-ffa450edef68
2000-12-16 11:45:13 +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
Jeff Trawick
a321e8bc43 Add "-D PROCESS_LOCK_IS_GLOBAL" to the httpd -V output when
appropriate.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87143 13f79535-47bb-0310-9956-ffa450edef68
2000-12-01 14:02:49 +00:00
Greg Stein
656a5d3081 Use "const char * const *" for process->argv (which is the correct
const-ness since we sometimes put "some string" in there, and also the CRT's
argv). propagate this change within http_main and mpm/winnt/ (also correct
some other const type usage within the MPM).

fix ab's call to parse_url() which removed a const to actually manipulate an
arg from the CRT's argv (indirectly via opt->arg). no idea how this has
avoided segfaulting.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87130 13f79535-47bb-0310-9956-ffa450edef68
2000-11-29 17:33:03 +00:00
Greg Stein
ead2dae94c *) Compensate for recent changes in the APR headers. Specifically, some
files need to specifically include stdio.h, or a particular apr_*.h
   header.

*) Adjust callers of apr_create_process() to deal with the extra "const"

*) Add "const" to args of ap_os_create_privileged_process()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87080 13f79535-47bb-0310-9956-ffa450edef68
2000-11-26 04:47:43 +00:00
William A. Rowe Jr
8aefb9c952 Extern symbols (per the warning) belong elsewhere, since (on Win32) the
http_main.c is both the startup and entry stub.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87009 13f79535-47bb-0310-9956-ffa450edef68
2000-11-18 15:00:39 +00:00
Ryan Bloom
b62a882802 Port mod_info to 2.0. This is basically a complete re-write to use the
config tree instead of re-reading the config file.  As a part of this
change, the config tree needs to be exposed to modules as ap_conftree.
Submitted by:	Ryan Morgan <rmorgan@covalent.net>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86948 13f79535-47bb-0310-9956-ffa450edef68
2000-11-14 01:55:26 +00:00
Ryan Bloom
1eda38942e Fix type complaints on Xlc.
Submitted by:	Victor J. Orlikowski <v.j.orlikowski@gte.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86939 13f79535-47bb-0310-9956-ffa450edef68
2000-11-13 16:26:42 +00:00
Ryan Bloom
d95eb05d77 Create a feature macro that determines if Autoconf was used to configure
the server.  The ap_ugly_hack variable is only valid if Autoconf was used
for the configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86802 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 18:51:08 +00:00
William A. Rowe Jr
f95da0f525 Get win32 building again... we need something just a little more sophisticated here
Submitted by:	John Sterling <sterling@covalent.net
Reviewed by:	rbb, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86796 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 04:44:43 +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
Ryan Bloom
140586d14f Namespace protect the rest of the macros defined by ap_config.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86661 13f79535-47bb-0310-9956-ffa450edef68
2000-10-19 00:05:00 +00:00
David Reid
096b214869 Remove a needless cast.
Submitted by:	Victor J Orlikowski <v.j.orlikowski@gte.net>
Reviewed by:	dreid@apache.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86149 13f79535-47bb-0310-9956-ffa450edef68
2000-08-26 10:02:03 +00:00
William A. Rowe Jr
6734be0c4e Provide the first real-world update for the new apr_initopt/apr_getopt
changes.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86035 13f79535-47bb-0310-9956-ffa450edef68
2000-08-09 14:56:55 +00:00
William A. Rowe Jr
1a9db204f5 Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...
see src/lib/apr/apr_compat.h for most details.
  Also a few minor nits to get Win32 to build.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86008 13f79535-47bb-0310-9956-ffa450edef68
2000-08-06 06:07:53 +00:00
Doug MacEachern
059d8dd212 prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 05:27:38 +00:00