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

181 Commits

Author SHA1 Message Date
Ryan Bloom
85e8fbd0e2 Add the ability to extend the methods that Apache understands
and have those methods <limit>able in the httpd.conf. It uses
the same bit mask/shifted offset as the original HTTP methods
such as M_GET or M_POST, but expands the total bits from an int to
an ap_int64_t to handle more bits for new request methods than
an int provides.
Submitted by:	Cody Sherr <csherr@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89869 13f79535-47bb-0310-9956-ffa450edef68
2001-08-02 04:25:20 +00:00
David Reid
da7f803429 Having gone through and expnaded out the hook macro it seemed a waste
to throw it away, so here it is added as comments for people who are
in the same place I was trying to debug what was going on inside a hook.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89496 13f79535-47bb-0310-9956-ffa450edef68
2001-07-04 03:16:33 +00:00
Ryan Bloom
f5aba03766 Cleanup the reporting of incorrect end tags for container directives.
PR:	7617
Submitted by:	Barrie Slaymaker <barries@slaysys.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89091 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 23:33:46 +00:00
Victor J. Orlikowski
2d32f84df8 More changes based on Ian's patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89089 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 18:37:41 +00:00
Chuck Murcko
86154b12b2 Add the AP_DECLARE()/AP_CORE_DECLARE macros on the return types of
functions used by mod_proxy for export in DLL
Submitted by:	Ian Holsman <IanH@cnet.com>
Reviewed by:	Chuck murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89078 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 04:35:41 +00:00
Bill Stoddard
eed63954f3 struct_ptr is a void*. The Windows compiler doesn't like it when you try
to do pointer math on a void*.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88905 13f79535-47bb-0310-9956-ffa450edef68
2001-04-20 19:11:21 +00:00
Doug MacEachern
cd7883893c Add ap_set_int_slot() function
PR:
Obtained from:
Submitted by:	John K. Sterling <sterling@covalent.net>
Reviewed by:	dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88902 13f79535-47bb-0310-9956-ffa450edef68
2001-04-20 16:43:39 +00:00
Ryan Bloom
cd0738be95 Add more options to the ap_mpm_query function. This also allows MPMs to
report if their threads are dynamic or static.  Finally, this also
implements a new API, ap_show_mpm, which returns the MPM that was
required into the core.

We tried to make all of the MPMs report their threading capabilities
correctly, but each MPM expert should double check us.

Submitted by:	Harrie Hazewinkel <harrie@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88851 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 19:00:39 +00:00
Victor J. Orlikowski
a08aa9643b Small docco fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88803 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 23:18:27 +00:00
Jeff Trawick
4cdef37393 Fix segfaults for configuration file syntax errors such as
"<Directory>" followed by "</Directory" and "<Directory>" followed
by "</Directoryz>"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88649 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 17:08:03 +00:00
Bill Stoddard
4732553655 Performance: Add quick_handler hook. This hook is called at the
very beginning of the request processing before location_walk,
translate_name, etc.  This hook is useful for URI keyed content
caches like Mike Abbott's Quick Shortcut Cache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88596 13f79535-47bb-0310-9956-ffa450edef68
2001-03-27 19:19:08 +00:00
Doug MacEachern
bc660e9860 top_module global variable renamed to ap_top_module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88582 13f79535-47bb-0310-9956-ffa450edef68
2001-03-26 15:39:52 +00:00
Jeff Trawick
0495cdf856 Report unbounded containers in the config file. Previously, a typo
in the </container> directive could result in the rest of the config
file being silently ignored, with undesired defaults used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88461 13f79535-47bb-0310-9956-ffa450edef68
2001-03-06 21:46:12 +00:00
Jeff Trawick
69629215b8 Use a proper prototype for ap_show_directives() and ap_show_modules() so
that they match their prototypes in http_config.h.

PR:			6980


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88445 13f79535-47bb-0310-9956-ffa450edef68
2001-03-03 02:13:49 +00:00
William A. Rowe Jr
5cccb4a478 Clean up namespace badness with s/configfile_t/ap_configfile_t/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88312 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 00:51:32 +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
Doug MacEachern
dd0b7af133 avoid c++ keywords
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88272 13f79535-47bb-0310-9956-ffa450edef68
2001-02-22 08:15:49 +00:00
Greg Stein
e78825ca70 - more ap_conf_vector_t fixup.
- break out the cmd_parms to ap_set_config_vectors to clarify/doc what is
  happening in there and because the function operates independent of cmds.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88227 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 04:26:13 +00:00
Greg Stein
dd9b08e321 *) Introduce "ap_conf_vector_t" type to assist with legibility and provide
some type safety. (unfortunately, our old "void*" is type-safe with the
   new one, but over time we should be better)

*) Propagate the new type to all appropriate functions.

*) Random cleaning, whitespace, stylistic nits.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88225 13f79535-47bb-0310-9956-ffa450edef68
2001-02-18 02:58:53 +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
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