1
0
mirror of https://github.com/apache/httpd.git synced 2025-06-04 21:42:15 +03:00

173 Commits

Author SHA1 Message Date
Geoffrey Young
a7a707f424 fix "Expected </Foo>> but saw </Foo>" errors in nested,
argumentless containers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102670 13f79535-47bb-0310-9956-ffa450edef68
2004-02-18 15:44:48 +00:00
André Malo
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
André Malo
e88fcf3c64 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102589 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 13:58:22 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
Geoffrey Young
a193efa1b7 Keep focus of ITERATE and ITERATE2 on the current module when
the module chooses to return DECLINE_CMD for the directive.
PR: 22299


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102469 13f79535-47bb-0310-9956-ffa450edef68
2004-01-30 19:43:38 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
Stas Bekman
19eb03c5a6 fix the config parser to support <Foo>..</Foo> containers (no
arguments in the opening tag) supported by httpd 1.3. Without
this change mod_perl 2.0's <Perl> sections are broken.
PR:
Obtained from:
Submitted by:	"Philippe M. Chiasson" <gozer@cpan.org>
Reviewed by:	stas


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101415 13f79535-47bb-0310-9956-ffa450edef68
2003-10-11 06:37:45 +00:00
Jeff Trawick
aa21671e13 switch to APR 1.0 API (which is still in flux)
because of the changes to the argument lists of apr_mmap_dup and apr_socket_create,
2.1-dev won't build with apr and apr-util's 0.9 branch anymore


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101154 13f79535-47bb-0310-9956-ffa450edef68
2003-09-03 19:27:12 +00:00
André Malo
7a51a3d41a split ap_process_resource_config into two functions (since we don't wanna
change the api). Only the first one (the ap_ entry point) now checks
for fnmatch and the second one will be called for every file/directory
included.
This, however, avoids infinite recursions, if a filename contains
wildcard characters.

PR: 22194


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100931 13f79535-47bb-0310-9956-ffa450edef68
2003-08-07 16:38:19 +00:00
Justin Erenkrantz
1a344d46b6 Allow restart of httpd to occur even with syntax errors in the config
file.  (Out-of-date DSOs with bad MMNs will still be fatal unfortunately.)

Add return parameter to ap_process_config_tree - OK on success, !OK on
syntax error.  We will no longer call exit() from ap_process_config_tree.
The caller must exit if there is an error (makes sense anyway).  This allows
the initial start-up code to delay the exit until trying to let the
signal_server optional function execute first.

(The chances are that the syntax error isn't in the PidFile directive.  If
that happens, we'll try the default one.  Oh, well.)

PR: 16813


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98693 13f79535-47bb-0310-9956-ffa450edef68
2003-02-17 07:04:50 +00:00
André Malo
f1c2200c5b fill out parms->err_directive while looking for open parents.
Otherwise when trying to log the error
(a) we segfault (if the directive was in another file)
(b) we show a wrong occurrence line number (start line of the previous
    container) or probably segfault, too (if no previous container exists).

PR: 17093


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98671 13f79535-47bb-0310-9956-ffa450edef68
2003-02-15 04:57:10 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
William A. Rowe Jr
8395761d8b Fix a typo reported by Blair Zajac <blair@orcaware.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98270 13f79535-47bb-0310-9956-ffa450edef68
2003-01-14 18:34:14 +00:00
William A. Rowe Jr
a2af7923e5 ap_server_root_relative never guarenteed that the resource exists, or
isn't a file pattern.  Correct the code to accept these cases (applied
  to both 2.0 and 2.1.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98264 13f79535-47bb-0310-9956-ffa450edef68
2003-01-14 16:56:16 +00:00
William A. Rowe Jr
1f49164f58 Once again, allow <Directory "C:\Users\*\html_files"> or other wildcard
patterns in Directory blocks.  Note a similar problem with Includes *.conf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98260 13f79535-47bb-0310-9956-ffa450edef68
2003-01-14 03:01:52 +00:00
Bill Stoddard
e78ff13c7c Tweak
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97819 13f79535-47bb-0310-9956-ffa450edef68
2002-12-09 14:43:32 +00:00
Bill Stoddard
8ccffa037b AddModules does not exist anymore
Submitted by:	Stas Bekman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97818 13f79535-47bb-0310-9956-ffa450edef68
2002-12-09 14:42:09 +00:00
Ian Holsman
fb72cf1416 Add support for using fnmatch patterns in the final path segment of an
Include statement (eg.. include /foo/bar/*.conf).
and remove the noise on stderr during config dir processing.

Submitted by:	Joe Orton <jorton@redhat.com>
Reviewed by:	Ian Holsman, Brian Pane


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96776 13f79535-47bb-0310-9956-ffa450edef68
2002-09-12 20:04:07 +00:00
Ian Holsman
72ccaa2ac0 Make module loading error messages more informative
Bug #11213
Obtained from: Ian Darwin <ian779@darwinsys.com>

Reviewed by:   Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96449 13f79535-47bb-0310-9956-ffa450edef68
2002-08-19 20:40:08 +00:00
Ian Holsman
6deba78a9a Renames Pending:
This clears the list of renames pending in apr-util.
 Parts of this list was alreadu done, but the pending list hadn't been updated.

 apr_hook_debug_current     from apr_current_hooking_module
 apr_hook_debug_show        from apr_show_hook

 apr_hook_global_pool       from apr_global_hook_pool
 apr_hook_sort_all          from apr_sort_hooks

 apr_uri_port_of_scheme     from apr_uri_default_port_for_scheme
 apr_uri_unparse            from apr_uri_unparse_components
 apr_uri_parse              from apr_uri_parse_components
 apr_uri_parse_hostinfo     from apr_uri_parse_hostinfo_components

 apr_uri_t                  from apr_uri_components

 All APR_URI_*              from all APU_URI_* symbols
 All APR_UNP_*              from all UNP_* symbols

PR:
Obtained from:
Submitted by:	 Thom May
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95966 13f79535-47bb-0310-9956-ffa450edef68
2002-07-06 20:04:38 +00:00
Justin Erenkrantz
798c1dae43 Add a filter_init function to the filters so that a filter can execute
arbitrary code before the handlers are invoked.

This resolves an issue with incorrect 304s on If-Modified-Since mod_include
requests since ap_meets_conditions() is not aware that this is a dynamic
request and it is not possible to satisfy 304 for these requests (unless
xbithack full is on, of course).  When mod_include runs as a filter, it is
too late to set any flag since the handler is responsible for calling
ap_meets_conditions(), which it should do before generating any data.

If a module doesn't need to run such arbitrary code, it can just pass NULL
as the argument and all is well.

PR:	9673
Reviewed by:	Ryan Bloom and others


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95906 13f79535-47bb-0310-9956-ffa450edef68
2002-06-28 08:40:25 +00:00
William A. Rowe Jr
7af68c0bf5 Solve the 80/20 by initializing and storing server_rec->timeout and
server_rec->keep_alive_timeout in apr_time_interval_t format (in apr
  units, whatever they be), as both values exist to pass into APR, and
  all APR timeouts are in apr_time_t.

Reviewed by:	Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95623 13f79535-47bb-0310-9956-ffa450edef68
2002-06-12 23:59:31 +00:00
William A. Rowe Jr
cb46f849e4 A few noops (at the moment.) Prepare for stuffing the directive into
the conf tree, without reinvoking the directive, even when EXEC_ON_READ.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95186 13f79535-47bb-0310-9956-ffa450edef68
2002-05-20 15:05:43 +00:00
Jeff Trawick
c871b41d3c stop using APLOG_NOERRNO in calls to ap_log_?error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95149 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 11:11:39 +00:00
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