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

249 Commits

Author SHA1 Message Date
Bill Stoddard
7da34b011d Add a new parameter to the quick_handler hook to instruct
quick handlers to optionally do a lookup rather than actually
serve content. This is the first of several changes required fix
several problems with how quick handlers work with subrequests.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94240 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 22:42:16 +00:00
William A. Rowe Jr
65a37752ec Eliminate potential ap_server_root_relative segfaults, with the input
of Jeff Trawick's style changes to the first patches.  Doesn't include
  the fixes to ssl [more complex], and we won't trap errors that involve
  ap_serverroot, since we presume that was normalized on the way in.
  Therefore, testing ap_server_root_relative(DEFAULT_FOO) cases
  should never become necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93965 13f79535-47bb-0310-9956-ffa450edef68
2002-03-16 18:26:58 +00:00
Sander Striker
8537b65cb0 Since noone seemed to have a real problem with it, change !! to
something that raises fewer questions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93949 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 09:50:14 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Ian Holsman
698dcdada9 Sander's Stylistic Submission
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93716 13f79535-47bb-0310-9956-ffa450edef68
2002-03-05 20:42:31 +00:00
Aaron Bannert
d5fdaf9cfd The pre_config hook now takes a return value. This allows modules to
cause the server to bail out under error conditions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93063 13f79535-47bb-0310-9956-ffa450edef68
2002-01-28 23:49:40 +00:00
Bradley Nicholes
fe065c4cfd Making sure that the global variables have been initialized to avoid linker
problems at least on NetWare
Submitted by: Pavel Novy


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92711 13f79535-47bb-0310-9956-ffa450edef68
2002-01-02 23:27:57 +00:00
Brian Pane
684afd3c44 Removed a large (8KB) buffer from the stack in ap_invoke_handler()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92602 13f79535-47bb-0310-9956-ffa450edef68
2001-12-26 09:52:53 +00:00
William A. Rowe Jr
cf5e402674 Move the insert_filter hook from the prepare request phase to the
invoke handler phase, since it can't fail, and contributes nothing
  to the request 'character', but everything to it's invocation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92471 13f79535-47bb-0310-9956-ffa450edef68
2001-12-14 03:30:23 +00:00
Bradley Nicholes
cab5223a9e Clean up GNU compiler issues on NetWare
Submitted by: Pavel Novy


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92429 13f79535-47bb-0310-9956-ffa450edef68
2001-12-11 19:36: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
Brian Pane
1dffdc2350 restructured the conditional logic in ap_merge_per_dir_configs() for faster execution
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92141 13f79535-47bb-0310-9956-ffa450edef68
2001-11-23 10:56:31 +00:00
William A. Rowe Jr
a933f4d949 Great badness - not a good idea to return OK when you don't modify the
resulting value, even if it's NULL.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91345 13f79535-47bb-0310-9956-ffa450edef68
2001-10-07 04:54:53 +00:00
William A. Rowe Jr
58fc8eaf53 AFAICT, we have never created server configs of _all_ modules for _all_
contexts, only when they come up (e.g., a directive of that particular
  module is provided) with the except that vhost containers complete the
  initialization of all modules.  I haven't stepped this, but it appears
  to be correct.

  This patch assures we can merge two incomplete directory sections
  together.  They will (obviously) need to be merged with a LHS default,
  e.g. a vhost's or main server's default dir config.  That's fine, this
  just allows either the LHS or RHS value to be null, and for merging to
  still succeed.

Reported by:  Sander Striker <striker@apache.org>
Additional Analysis:  Doug MacEachern


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91098 13f79535-47bb-0310-9956-ffa450edef68
2001-09-21 06:23:29 +00:00
William A. Rowe Jr
70baf69ae8 Overhauled ap_server_root_relative, so that it now changes any path
to canonical form through apr.  Also assures that a change to the
  ServerRoot through a -C option takes effect before locating the
  httpd.conf file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90571 13f79535-47bb-0310-9956-ffa450edef68
2001-08-23 19:13:53 +00:00
Ryan Bloom
6e932b2870 Fix the new method code. We need to cast 1 to an apr_int64_t or it will
be treated as a 32-bit integer, and it will wrap after being shifted
32 times.
Submitted by:	Cody Sherr <csherr@covalent.net> and
		Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90090 13f79535-47bb-0310-9956-ffa450edef68
2001-08-11 04:04:13 +00:00
William A. Rowe Jr
5f9b514613 Provide an ap_set_deprecated() fn for quick-and-dirty 'we don't do this'
entries in the command table.

  (Also fixes a nit about returning a single bit of an apr_int_64 as an int.
  Know how this group loves !! expresssions :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89896 13f79535-47bb-0310-9956-ffa450edef68
2001-08-03 00:59:01 +00:00
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