1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-11 02:42:23 +03:00
Commit Graph

261 Commits

Author SHA1 Message Date
Greg Stein
5dc34feb12 *) continued header revamping
*) torch some headers (and some libs) from the autoconf stuff


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88061 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 14:04:21 +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
Greg Ames
a31eafbdcc back out recent breakage. If the lstat isn't executed, finfo isn't
initialized, and the code was looking at random garbage.

This gets the server a little closer to starting on apache.org.  There's still
an issue with mod_include not resolving apr_get_username when it's dynamically
loaded.

Submitted by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87911 13f79535-47bb-0310-9956-ffa450edef68
2001-01-29 22:19:17 +00:00
William A. Rowe Jr
7f4a5fe7f5 Use the appropriate APR_FINFO_flags for the apr_stat/lstat/getfileinfo
calls to avoid ownership and permissions on Win32 when they are not
  required, and until they are implemented.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87873 13f79535-47bb-0310-9956-ffa450edef68
2001-01-27 21:28:28 +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
Ben Laurie
1bd791c4e9 The current hooking module is _not_ a debugging aid.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87822 13f79535-47bb-0310-9956-ffa450edef68
2001-01-24 22:52:52 +00:00
William A. Rowe Jr
1dd9e07fd8 Accomodate the change to the apr_read_dir() arguments, and change all
apr_dirfoo() and apr_foodir() commands to apr_dir_foo() to match the
  earlier-renamed apr_dir_open().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87790 13f79535-47bb-0310-9956-ffa450edef68
2001-01-23 04:14:24 +00:00
Ryan Bloom
b825ae06ca Remove AddModule and ClearModuleList. Neither directive really makes
much sense anymore, since we use the hooks to order modules correctly.
This also removes the possability that one module will ever register the
same function for the same hook twice.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87784 13f79535-47bb-0310-9956-ffa450edef68
2001-01-21 22:14:16 +00:00
Ryan Bloom
061b5cce52 Add a call to apr_hook_deregister_all() in the clear_module_list function.
The basic problem was that when we load the modules, we call the
register_hooks() function from the module, but then we clear the module
list for all active modules, and add them back in one at a time.  When we
add them back, we re-call the register_hooks() function, thus adding
each function a second time.  This was causing apache.org to log every
request twice in the access log.  By calling apr_hook_deregister_all()
when we unload the module, the second call to register the hooks is the
only call that matters.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87774 13f79535-47bb-0310-9956-ffa450edef68
2001-01-21 05:21:32 +00:00
William A. Rowe Jr
cd1ef027c2 The changes required for the APR_FINFO_wanted argument to
apr_stat/lstat/getfileinfo.  These are -NOT- optimal, they
  are simply the required changes to get the server working.
  The size of the patch is a warning about how we need to
  really look at what we are trying to accomplish with all
  of these stat/lstat calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87760 13f79535-47bb-0310-9956-ffa450edef68
2001-01-20 21:42:23 +00:00
William A. Rowe Jr
bad71eeebd The only symbol dropped, not counting regcomp regerror regexec regfree
which aren't namespace protected in the first place.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87734 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 13:43:39 +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
095717c705 get rid of some bogus uses of perror()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87620 13f79535-47bb-0310-9956-ffa450edef68
2001-01-09 00:27:03 +00:00
Doug MacEachern
40391fb9f2 adjust remaining modules to use the new handler hook method (Alan Edwards)
bring back the old handler prototype by reusing r->handler (dougm)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87617 13f79535-47bb-0310-9956-ffa450edef68
2001-01-08 23:55:12 +00:00
Ben Laurie
778f927c42 Keep Greg happy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87608 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 23:04:15 +00:00
Ben Laurie
77f15c7732 Strip trailing stuff from mime types.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87607 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 22:45:26 +00:00
Ben Laurie
45f620672d Make handlers use hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87604 13f79535-47bb-0310-9956-ffa450edef68
2001-01-07 19:55:59 +00:00
Allan K. Edwards
0be0106405 add pool parameter to ap_is_directory and ap_is_rdirectory
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87593 13f79535-47bb-0310-9956-ffa450edef68
2001-01-05 20:44:44 +00:00
Ryan Bloom
83c2b3f96b Stop copying file names that we get from apr_file_t's and apr_dir_t's.
We copy the data when we store it in the structures, we can just return
a pointer from there, and use const data.  This puts the onus back on
Apache to copy the data if it needs to modify it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87592 13f79535-47bb-0310-9956-ffa450edef68
2001-01-05 19:40:05 +00:00
Ben Laurie
19519dff8a Generic hooks (and a demo content filter module).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87568 13f79535-47bb-0310-9956-ffa450edef68
2001-01-02 17:41:38 +00:00
Ryan Bloom
703d13f7c5 When we are starting the server, we have a pool that can be used to open
the error log.  Rather than try to log a regular error, log an error with
the pool that we have, so that we can open stderr successfully.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87562 13f79535-47bb-0310-9956-ffa450edef68
2001-01-01 00:13:41 +00:00
Ryan Bloom
40eae41078 Rename the apr_opendir symbol to apr_dir_open. This makes more sense,
and the rename was proposed a while ago inside of APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87385 13f79535-47bb-0310-9956-ffa450edef68
2000-12-17 03:35:39 +00:00
Jeff Trawick
290df5f182 move closer to IPv6 support by changing the server_addr_rec
representation of the bound address to something which handles
IPv6; this also allows us to switch to APR resolver routines
in places instead of calling gethostbyname() and gethostbyaddr()
directly

Issues remaining with this set of changes:

1) apr_snprintf()'s %pA formatting needs to change to take
   apr_sockaddr_t * instead of sockaddr_in * -OR- just get rid
   of that type of formatting
2) apr_get_inaddr() is no longer used and should be removed


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87363 13f79535-47bb-0310-9956-ffa450edef68
2000-12-15 19:20:12 +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
William A. Rowe Jr
bdf3f917c0 Solve the os_is_absolute_path problem for the moment.
This is -not- the permanent patch for 2.0, simply a placeholder till we
  have the canonical name implemented in APR for good.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86804 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 20:05:00 +00:00
William A. Rowe Jr
37a90cb777 Get Win32 building again.
Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86797 13f79535-47bb-0310-9956-ffa450edef68
2000-11-02 04:46:42 +00:00
Ryan Bloom
7d9a83ff92 Make mod_auth_db compile cleanly in 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86768 13f79535-47bb-0310-9956-ffa450edef68
2000-10-30 20:13:04 +00:00
Manoj Kasichainula
b1fb90877e Add back suexec support.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86712 13f79535-47bb-0310-9956-ffa450edef68
2000-10-23 15:30:57 +00:00
William A. Rowe Jr
d6490633eb Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols
for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper)
  and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE.
  All _VAR_ flavors changes to _DATA to be absolutely clear.
  Thank you Greg, for the most obvious suggestion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86609 13f79535-47bb-0310-9956-ffa450edef68
2000-10-16 06:05:15 +00:00
Jim Jagielski
6ebf77b96c Port over the config directory stuff...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86409 13f79535-47bb-0310-9956-ffa450edef68
2000-10-05 22:35:08 +00:00
William A. Rowe Jr
01f4c4f960 The lots of little ones... APR_IS_STATUS_condition(rv) conditional macros
replacing the majority of fallible rv == APR_condition tests.  But there
  are lots more to fix, these are the obvious ones that already did proper
  canonical error conversion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86405 13f79535-47bb-0310-9956-ffa450edef68
2000-10-05 17:33:14 +00:00
Jeff Trawick
21d948e6bc Avoid a segfault when parsing .htaccess files. An
uninitialized tree pointer was passed to ap_build_config().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86265 13f79535-47bb-0310-9956-ffa450edef68
2000-09-20 17:35:59 +00:00
Jeff Trawick
2a2e34443e Fix a bug parsing configuration file containers. With a sequence
like this in the config file

       <IfModule mod_kilroy.c>
       any stuff
       </IfModule>
       <IfModule mod_lovejoy.c>
       (blank line)
       any stuff
       </IfModule>

the second container would be terminated at the blank line due to
sediment in the buffer from reading the prior </IfModule> and an
error message would be generated for the real </IfModule> for the
second container.  Also due to this problem, any two characters
could be used for "</" in the close of a container.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86233 13f79535-47bb-0310-9956-ffa450edef68
2000-09-15 16:50:39 +00:00
Ryan Bloom
b0f3a1dfcb Remove a bunch of warnings from the server when compiled using
--with-maintainer-mode


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86070 13f79535-47bb-0310-9956-ffa450edef68
2000-08-14 03:07:58 +00:00
Ken Coar
db1852bded Preset the cmd_parms->limited field to the magic 'no limit active'
value, and add some prototype API routines for expanding support
	for arbitrary extension HTTP methods.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86053 13f79535-47bb-0310-9956-ffa450edef68
2000-08-11 23:41:53 +00:00
Jeff Trawick
127fc59162 Fix a config tree problem.
The following configuration file demonstrates the problem:

<IfModule mod_rewrite.c>
RewriteEngine on
RewriteMap    quux-map       prg:/tmp/apache-2.0/map.quux.pl
RewriteRule   ^/~quux/(.*)$  /~quux/${quux-map:$1}
</IfModule>

After this config file is parsed, the only statement in the config
tree is the last statement in the IfModule container ("RewriteRule blah
blah").

The problem is that when ap_build_config_sub() handles this type of
construct, it moves *current to the end of the list before returning.
If this construct were the first thing in the file, the caller would
set conftree to *current, not realizing that there were list elements
before *current.  The caller doesn't have addressability to those list
elements.

With this change, ap_build_config_sub() sets *conftree before
walking *current to the end of the list.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85993 13f79535-47bb-0310-9956-ffa450edef68
2000-08-04 23:22:57 +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
William A. Rowe Jr
847b20108c Add APR_EOL_STR for a platform specific text delimiter, provided by
apr.h (defined in apr.h.in and apr.hw).  This is needed -only- in APR
  created files (true raw files) such as logs.  It is not required in any
  splat to screen (stderr/stdout) formatting, nor any html markup.

  Some other modules slipped through in the prior apr_strings.h commit.
  Sorry 'bout that.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85878 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 01:06:32 +00:00
Ryan Bloom
22d9fbdec0 Move all APR functions related to strings to their own directory, and
create a new header for those functions.  This is the first step to
removing the apr/lib directory completely, and moving those files/functions
to descriptive directories.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85867 13f79535-47bb-0310-9956-ffa450edef68
2000-07-21 19:50:58 +00:00
Jeff Trawick
b5c0ae056b Include strings.h for strcasecmp(), strncasecmp(), and bzero().
Include time.h for time().

This removes a bunch of compiler warnings with gcc -Wall on AIX.
Submitted by:	Jeff Trawick, Victor Orlikowski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85723 13f79535-47bb-0310-9956-ffa450edef68
2000-06-28 14:33:48 +00:00
Doug MacEachern
2f0cdb36b0 parms needs err_directive incase execute_now() returns non-NULL (e.g. if LoadModule fails)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85692 13f79535-47bb-0310-9956-ffa450edef68
2000-06-25 22:50:10 +00:00
Jeff Trawick
de5c9c1eda OS/390 needs arpa/inet.h for htonl().
Submitted by:	Greg Ames


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85681 13f79535-47bb-0310-9956-ffa450edef68
2000-06-24 02:01:28 +00:00
Jeff Trawick
c58c39beeb Use the new command-handler initializer macros in mod_auth;
clean up the resulting warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85609 13f79535-47bb-0310-9956-ffa450edef68
2000-06-18 13:33:29 +00:00
Ben Laurie
8da89daa47 More command handlers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85604 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 21:37:05 +00:00
Ben Laurie
c0a4cb7873 More consification, correct command initialisation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85599 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 16:29:53 +00:00
Ben Laurie
c1b39458ab Command handler revamp. Note that this makes the code produce a LOT of
warnings!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85595 13f79535-47bb-0310-9956-ffa450edef68
2000-06-17 11:13:05 +00:00
Jeff Trawick
78571030f9 Fix segfault when reporting this type of syntax error:
"</container> without matching <container> section", where
container is VirtualHost or Directory or whatever.

This was a path not covered by the fix in 2.0a4 to report
the proper line numbers (sorry!).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85585 13f79535-47bb-0310-9956-ffa450edef68
2000-06-16 12:00:58 +00:00