1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-25 10:59:28 +03:00
Commit Graph

190 Commits

Author SHA1 Message Date
Jim Jagielski
08c97ba290 No functional change: remove "internal" tab spacing/formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345053 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 16:31:25 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Paul Querna
579610c0c5 - Fix style nits in the new hash config code. No Functional changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179618 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 17:52:26 +00:00
Paul Querna
d4dfb2fc44 - Fix graceful restarts with the new hashed configuration. The hash now allocates out of the pconf pool, instead of the process pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@179617 13f79535-47bb-0310-9956-ffa450edef68
2005-06-02 17:49:46 +00:00
Paul Querna
3a4de8d171 - Use a hash for the configuration command lookup implementation. Now modules can properly directives without dependence on the LoadModule order.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178990 13f79535-47bb-0310-9956-ffa450edef68
2005-05-29 21:39:39 +00:00
Paul Querna
da9a8de753 Add AP_INIT_TAKE_ARGV. There can be some inconsistent results because of the behavoir of ap_getword_conf. Do not rely upon any last argument that is "". If the argument is in the middle of the line, it should work correctly.
This is updated from the version sent to dev@httpd to fix the behavoir with 0 arguments.

* include/http_config.h: minor MMN bump for the new interface.
* modules/generators/mod_autoindex.c: Migrate IndexOptions to the new ARGV command type.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168202 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 22:23:00 +00:00
Joe Orton
a494258e4b * server/config.c (process_resource_config_nofnmatch): Fail with
useful error message if the config file can't be opened.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@167965 13f79535-47bb-0310-9956-ffa450edef68
2005-05-03 19:41:02 +00:00
Rich Bowen
ee8e3cfdd9 "misspelled" has been "mis-spelled" for quite long enough.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159808 13f79535-47bb-0310-9956-ffa450edef68
2005-04-02 20:00:39 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Joe Orton
28a2fdc595 Implement -t -DDUMP_MODULES using generic test_config hook rather than
hooking into mod_so from main.c:

* include/http_config.h, server/config.c: Declare test_config hook.

* server/main.c: Drop hooks into mod_so; run test_config hooks.

* modules/mappers/mod_so.h: Drop ap_dump_loaded_modules optional
function.

* modules/mappers/mod_so.c (dump_loaded_modules): Renamed from
ap_dump_loaded_modules; only run if -DDUMP_MODULES is defined.
(register_hooks): Register test_config hook instead of optional
function.

Reviewed by: Justin Erenkrantz, Paul Querna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104685 13f79535-47bb-0310-9956-ffa450edef68
2004-08-17 13:47:10 +00:00
Bradley Nicholes
6e231373bc Allocate memory from the temp_pool rather than the stack to avoid blowing fixed length stacks while evaluating nested includes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104310 13f79535-47bb-0310-9956-ffa450edef68
2004-07-16 20:30:43 +00:00
Paul Querna
d16de77fa0 remove tabs from my last commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104284 13f79535-47bb-0310-9956-ffa450edef68
2004-07-14 07:25:25 +00:00
Paul Querna
9d66007aa2 Added 'AllowOverride Options=Indexes,MultiViews' to give an admin better
control over what options can be used in .htaccess files.

PR: 29310
Submitted by: Tom Alsberg <alsbergt-apache cs.huji.ac.il>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104283 13f79535-47bb-0310-9956-ffa450edef68
2004-07-14 06:36:42 +00:00
André Malo
49f48fb4b4 changed the following APIs to return an error instead of hard exiting:
ap_add_module, ap_add_loaded_module, ap_setup_prelinked_modules,
and ap_process_resource_config


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103517 13f79535-47bb-0310-9956-ffa450edef68
2004-04-25 17:23:31 +00:00
André Malo
29e1f5d480 ap_add_named_module is not used and maintained anymore. Drop it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103516 13f79535-47bb-0310-9956-ffa450edef68
2004-04-25 17:05:51 +00:00
André Malo
6f5e92ccce Include directives no longer refuse to process symlinks on
directories. Instead there's now a maximum nesting level
of included directories (128 as distributed). This is configurable
at compile time using the -DAP_MAX_INCLUDE_DIR_DEPTH switch.

PR: 28492


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103472 13f79535-47bb-0310-9956-ffa450edef68
2004-04-21 21:24:28 +00:00
Bradley Nicholes
cbe1841ea9 Don't allocation large buffers on the stack to avoid over-running a fixed length stack when ap_build_cont_config() is called recursively (ie. nested <IfDefine> blocks).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103290 13f79535-47bb-0310-9956-ffa450edef68
2004-04-07 21:43:01 +00:00
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