1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

353 Commits

Author SHA1 Message Date
Greg Stein
b97ec4c63a drop the "container" param from ap_walk_config(). callers should simply
pass the first child, rather than expecting the walker to do it.
remove the nasty "static" variable inside ap_walk_config(). it now walks the
    tree provided with no worries about bumping up/down levels.
minor refactor between ap_walk_config() and ap_walk_config_sub() to clean up
    some logic and clarify the code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85025 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 12:27:02 +00:00
Greg Stein
c2c13c67c3 clean up cmd_parms: config_file is no longer valid; end_token is bogus;
add directive.
move configfile_t and functions from httpd.h to http_config.h
new signature for ap_build_config() (since config_file removed from cmd_parms)
add "data" to ap_directive_t for future use by modules. add filename.
syntax checking for section-close directives: a section-open must exist,
    the section-close must be </FOO>, and the open/close must match.
    the file as a whole must be properly balanced (issue errors for each
    unmatched section-open).
</FOO> command_rec structures are obsolete. Remove from http_core.c.
do not store </FOO> directives in the config tree.
clean out section-close logic from http_core.c (and old, related comments)
<Limit> and <LimitExcept> must walk their children.
new mechanism in ap_check_cmd_context() for testing enclosure in a
    Directory/Location/File: find_parent()
<IfModule> and <IfDefine> must pass cmd->context when walking the children
several places: we had a walk followed by ap_get_module_config(). that
    assumed the walk would create a config that we could fetch, which is not
    true -- it is possible that the children are all from other modules
    (e.g. the <Files> section in httpd.conf-dist has no "core" directives).
    using ap_set_config_vectors() ensures we get a structure, and it returns
    it to us.
    [ note: when we had </Directory> (and friends) in the tree, the config
      would get created; removing the directive removed the config; this
      was a bitch to track down :-) ]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85024 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 12:00:43 +00:00
Greg Stein
059ab7a790 handle error messages during building and processing of the configuration.
add missing return statements, wrap some lines, remove unused vars.
move syntax error reporting and exit(1) back to the right place (to be
    fixed in a future pass; the exit() is inappropriate for parsing
    .htaccess files).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85023 13f79535-47bb-0310-9956-ffa450edef68
2000-04-24 08:35:56 +00:00
Roy T. Fielding
7cbb1cb050 Finished move of ap_md5 routines to apr_md5. Removed ap_md5.h.
Replaced more magic numbers with MD5_DIGESTSIZE.  Yuck.

Submitted by:	William Rowe, Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85017 13f79535-47bb-0310-9956-ffa450edef68
2000-04-23 02:32:58 +00:00
Ryan Bloom
ab31187b8d Parse the config tree, instead of the config file. This is a first step there
are some big improvements to be made to this code, but this works now, and
it is a first step.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85015 13f79535-47bb-0310-9956-ffa450edef68
2000-04-22 22:54:30 +00:00
Ryan Bloom
de3a77dc01 Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84963 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 15:59:20 +00:00
Jeff Trawick
a212f927b0 get rid of an unused variable from virtualhost_section()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84917 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 02:22:20 +00:00
Roy T. Fielding
057b29f829 Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84878 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 08:44:21 +00:00
Jeff Trawick
81a15da717 when logging a failure of ap_mmap_create(), pass the returned
status to ap_log_rerror() instead of the current errno value


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84847 13f79535-47bb-0310-9956-ffa450edef68
2000-03-29 02:52:31 +00:00
Ryan Bloom
63f93a6504 Backout layered I/O changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84842 13f79535-47bb-0310-9956-ffa450edef68
2000-03-27 16:22:30 +00:00
Ryan Bloom
6a4d775449 Enabled layered I/O. Docs are forthcoming.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84837 13f79535-47bb-0310-9956-ffa450edef68
2000-03-25 15:00:10 +00:00
Jeff Trawick
b222ae5825 get rid of unused local variable w in set_error_document()
Submitted by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84821 13f79535-47bb-0310-9956-ffa450edef68
2000-03-22 09:46:38 +00:00
Tony Finch
898f959cea Some TODOCs have been DOCced.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84816 13f79535-47bb-0310-9956-ffa450edef68
2000-03-21 19:10:09 +00:00
Tony Finch
ac23f18cd5 Explain the changed ErrorDocument syntax.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84813 13f79535-47bb-0310-9956-ffa450edef68
2000-03-21 18:28:27 +00:00
Manoj Kasichainula
ad3cb55128 Eliminate implicit usage of access.conf and srm.conf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84771 13f79535-47bb-0310-9956-ffa450edef68
2000-03-15 23:18:32 +00:00
dgaudet
7956b7ecec go dirk go, RAW_ARGS is evil. added a TODOC.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84767 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 19:29:40 +00:00
Dirk-Willem van Gulik
b779325522 Nasty backwards compatibility breaking 'fix' to get rid of
ErrorDocument	201 "Some string without a closing quote

case which is just pure ugly. I am _NOT_ going to be offended
if anyone rolls back this patch OR if anyone suggests to have
an ErrorDocument2 which the proper syntax/semantics.

But I thought lets take my chance whilst everyone is still
recovering from the apachecon.

Dw.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84764 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 13:32:08 +00:00
Jim Jagielski
70ef1e69d5 Backport the CSS security fixes to Apache 2.0a. Or is that forward
port? My sense of direction is all confused.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84751 13f79535-47bb-0310-9956-ffa450edef68
2000-03-13 20:27:29 +00:00
Ryan Bloom
b1c26f031a Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
2000-03-10 00:07:37 +00:00
Ryan Bloom
f8a7fce423 Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is
defined correctly in all C files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84531 13f79535-47bb-0310-9956-ffa450edef68
2000-01-28 18:02:29 +00:00
Ryan Bloom
0432102c4f Cleanup a few things with the compile. There were also a few macro name
changes I missed earlier.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84496 13f79535-47bb-0310-9956-ffa450edef68
2000-01-19 02:09:03 +00:00
Ryan Bloom
a8ce196da5 Finish the commits for the change in the header files. Basically, this hides
all of the Apache macros that modules don't need access to.  This should
have been committed with the modules, but I wasn't paying attention to the
directory I was in when I ran the commit.
Submitted by:	Manoj Kasichainula and Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84493 13f79535-47bb-0310-9956-ffa450edef68
2000-01-19 01:16:31 +00:00
dgaudet
faff1f01dd time overhaul:
- ap_time_t is a 64-bit scalar, microseconds since epoch
- ap_exploded_time_t corresponds to struct tm with a few extras

probably broken on anything except linux.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84413 13f79535-47bb-0310-9956-ffa450edef68
2000-01-09 05:18:31 +00:00
Ryan Bloom
8f26ac7df4 Separate the stat structure from the file structure and use ap_stat and
ap_getfileinfo in apache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84397 13f79535-47bb-0310-9956-ffa450edef68
2000-01-06 14:43:41 +00:00
Manoj Kasichainula
319baedbb6 Add back support for UseCanonicalName in <Directory> containers. Found
by Dave Colasurdo <davecola@us.ibm.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84347 13f79535-47bb-0310-9956-ffa450edef68
1999-12-21 07:54:08 +00:00
Ryan Bloom
8c56e6dfc3 First step in getting Apache to use APR's time libraries. This gets a good
number of them, but I think there are more time values still in the Apache
code.  This works under Linux, but has not been tested anywhere else.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84338 13f79535-47bb-0310-9956-ffa450edef68
1999-12-20 16:38:39 +00:00
Ryan Bloom
516c90f02f Get rid of an instance of ap_file_os_t from the Apache source. I will
be finishing the cleansing of these interim variables over the next few
days.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84279 13f79535-47bb-0310-9956-ffa450edef68
1999-12-11 00:13:19 +00:00
Ryan Bloom
e35f6d1f09 Update some dependancies. Move the final two files out of apr/inc and into
apr/include.  Basically just finish some cleanup from some changes I've
been making over the last two days.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84147 13f79535-47bb-0310-9956-ffa450edef68
1999-11-23 13:47:01 +00:00
David Reid
98ad401c48 Next stage of ap_mmap support. Tested on FreeBSD and BeOS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84139 13f79535-47bb-0310-9956-ffa450edef68
1999-11-20 11:56:13 +00:00
Ryan Bloom
975ea85ea2 First step in removing the fprintf(stderr problem from Apache. Basically,
I defined APLOG_STARTUP, which refrains from printing the date string
and the log level information in log_error_core.  I then changed all the
fprintf(stderr calls to ap_log_error, and used APLOG_STARTUP.
log_error_core on Unix takes care of creating a log file and directing
it to stderr if a log file isn't already active.  I will continue to
make these changes tomorrow.  Currently, the main code and the dexter
mpm have been modified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84134 13f79535-47bb-0310-9956-ffa450edef68
1999-11-18 23:07:53 +00:00
Ryan Bloom
370fc31b00 Cleanup the ZZZ comments. Basically these used to mark places where APR
is needed.  It is much easier to do this conversion by hand than by
searching for old comments, so they are going away now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84128 13f79535-47bb-0310-9956-ffa450edef68
1999-11-16 18:32:05 +00:00
Brian Havard
ade03101b9 Get rid of a number of 'incompatible pointer type' warnings using
ap_os_{get,put}_file() on platforms who's ap_os_file_t is not an int.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84109 13f79535-47bb-0310-9956-ffa450edef68
1999-11-08 06:05:50 +00:00
Bill Stoddard
856a8fef20 This patch fixes EBCDIC conversion for Apache 1.3.9 on platforms that
support mmap.  Currently, ap_checkconv() is called only if mmap is not
supported, or if mmap fails.  This results in mangled .gif's and .jpg's
etc. because EBCDIC-ASCII conversion is done by default when
CHARSET_EBCDIC is defined.

Note: I suspect all this will radically change when EBCDIC support is
done in an IOL. However, I think it is valuable to put this patch into
Apache 2.0 as a reminder since it is just a code move rather than new code.

Submitted by:	Greg Ames
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84016 13f79535-47bb-0310-9956-ffa450edef68
1999-10-21 18:28:14 +00:00
Bill Stoddard
7eb6c14047 Fix an ap_log_rerror call in a Win32 code branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84013 13f79535-47bb-0310-9956-ffa450edef68
1999-10-20 21:00:00 +00:00
Ryan Bloom
482dcf3495 Add a status value to ap_log_error and ap_log_rerror. This allows us to use
apr_status codes in our error logs.  The main advantage of this, is portable
error codes.  Now, Windows will finally be able to use errno!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84007 13f79535-47bb-0310-9956-ffa450edef68
1999-10-20 12:50:12 +00:00
Ryan Bloom
234823c5c5 I missed one function when swapping paramters. This fixes it. I think I
have caught them all this time.  I really hope this is the final time I have
to swap parameters.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83996 13f79535-47bb-0310-9956-ffa450edef68
1999-10-14 14:36:49 +00:00
Martin Kraemer
0c7673561b Fix typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83969 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 22:07:29 +00:00
Ryan Bloom
e75cbac28c Bring file_io up to the new parameter order for APR. I have decided to do
these on a directory by directory basis for the rest of APR.  I hope to
cause fewer problems for other developers by doing it this way.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83937 13f79535-47bb-0310-9956-ffa450edef68
1999-10-06 23:04:16 +00:00
Bill Stoddard
6737d44fe5 Update ap_send_fd() and ap_send_fd_length() to use an ap_file_t. Hummm...
Still need to get sendfile() in. First, lets get the serving basically
working again :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83930 13f79535-47bb-0310-9956-ffa450edef68
1999-10-05 05:14:43 +00:00
Ryan Bloom
2b361ec557 First patch to re-order function parameters. This one gets the low hanging
fruit, and moves most of the result parameters to the first argument.
Future patches in this series will move the rest of the result parameters
to the beginning of the list, and will move the context's to the end of the
list


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83927 13f79535-47bb-0310-9956-ffa450edef68
1999-10-04 16:38:16 +00:00
Ryan Bloom
e4e32bb59e A change to how APR uses user data. Now, user data is a linked list that
is retreivable using a char string.  Basically, you provide a string that
will be used as a key when you store the data.  If the key was used before,
we will overwrite the old data.  When you want to retreive your data, pass
in the same key, and we will find the data you care about.  This also makes
it harder to put user data in when creating a context, so that option has
disappeared.  It is also impossible to inherit user data from parent contexts.
This option may be added in later.  I will be documenting this VERY soon.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83901 13f79535-47bb-0310-9956-ffa450edef68
1999-09-14 13:37:45 +00:00
Ben Laurie
5536bd4070 Fix warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83894 13f79535-47bb-0310-9956-ffa450edef68
1999-09-11 22:14:37 +00:00
Ryan Bloom
69adf379b4 Remove all of the calls to functions like "ap_popenf". These functions were
moved down to APR, but they are being removed.  They are not portable, and
were only moved down for backwards compatability.  With this change, they can
be safely removed, which is the next commit on it's way.
Submitted by:  Ryan Bloom and Paul Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83879 13f79535-47bb-0310-9956-ffa450edef68
1999-09-08 14:15:55 +00:00
Ryan Bloom
c37f14ddf3 Changed pools to contexts. Tested with prefork and pthread mpm's. I'll
check this out tomorrow and make sure everything was checked in correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83852 13f79535-47bb-0310-9956-ffa450edef68
1999-08-31 05:35:52 +00:00
Roy T. Fielding
8e53719a8e Remove error message that was missed in an earlier merge with 1.3.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83829 13f79535-47bb-0310-9956-ffa450edef68
1999-08-28 02:37:59 +00:00
Roy T. Fielding
3e46488a44 Replace file descriptors with APRFile.
Submitted by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83780 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:34:15 +00:00
Roy T. Fielding
44679abe2b Odd comments and leftover bits from the pthreads version.
The comments really should be deleted, or at least cleaned up.

Submitted by:	pthreads leftovers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83779 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:30:39 +00:00
Roy T. Fielding
75496e7d9f Add an erroe message when handler not found. This may be bogus,
since a change similar to this in 1.3.x generated many PR complaints.

Submitted by:	pthreads leftovers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83778 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:08:08 +00:00
Roy T. Fielding
f8d5b393f2 Use less memory when generating an error message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83775 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 15:52:46 +00:00
Roy T. Fielding
e3978962f9 Start to implement module-defined hooks that are a) fast and b) typesafe.
Replace pre_connection module call with a register_hook call and
implement pre_connection as a hook. The intent is that these hooks will
be extended to allow Apache to be multi-protocol, and also to allow the
calling order to be specified on a per-hook/per-module basis.  [Ben Laurie]

Port a bunch of modules to the new module structure.
["Michael H. Voase" <mvoase@midcoast.com.au>]

Submitted by:	Ben Laurie


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83770 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 14:18:40 +00:00