1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

117 Commits

Author SHA1 Message Date
Ryan Bloom
8c385f0dbd Make reliable piped logs work on 2.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85136 13f79535-47bb-0310-9956-ffa450edef68
2000-05-04 04:02:37 +00:00
Ryan Bloom
de87338df2 Update the version string for the current dev version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85085 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 19:03:15 +00:00
Ryan Bloom
78b0a254fd Update version information for 3rd alpha.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85084 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 18:41:53 +00:00
Doug MacEachern
b7f8b9d3df change ap_hook_pre_connection from VOID to RUN_ALL
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85066 13f79535-47bb-0310-9956-ffa450edef68
2000-04-27 23:44:16 +00:00
Doug MacEachern
6644b34387 add AP_ prefix to *HOOK* macros
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85045 13f79535-47bb-0310-9956-ffa450edef68
2000-04-26 07:14:39 +00:00
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
Bill Stoddard
0f381e5030 Eliminate compile warning on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85010 13f79535-47bb-0310-9956-ffa450edef68
2000-04-21 19:52:34 +00:00
Ryan Bloom
52c04b67a7 Add support for pool to log_error_core. Also add ap_log_perror to allow
logging without either a request or server _rec.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85002 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 16:25:40 +00:00
Jeff Trawick
cc6e027c47 [EBCDIC] Port Paul Gilmartin's CRLF patch from 1.3. This replaces most
of the \015, \012, and \015\012 constants with macros.
Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84998 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 14:36:01 +00:00
Brian Havard
6127cc7953 Provide prototypes for the provided strcasecmp & strncasecmp.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84996 13f79535-47bb-0310-9956-ffa450edef68
2000-04-19 16:20:07 +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
dgaudet
59864841f2 more namespace cleanup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84961 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 02:39:08 +00:00
Ryan Bloom
ad33e9ead2 First step to getting configuration modules working. This step creates
a tree, but does not use the tree for anything.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84949 13f79535-47bb-0310-9956-ffa450edef68
2000-04-12 21:57:48 +00:00
Jeff Trawick
98730c630f stop relying on a macro to map signal() to ap_signal(); call
ap_signal() directly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84916 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 02:09:44 +00:00
Jeff Trawick
b2a55b8a88 if HAVE_SYSLOG is defined but LOG_PRIMASK isn't, define LOG_PRIMASK to
the standard value


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84915 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 02:01:09 +00:00
Roy T. Fielding
aa4e2578a1 And then there was 2.0a3-dev, and Ryan said "Doh!"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84888 13f79535-47bb-0310-9956-ffa450edef68
2000-04-01 01:14:23 +00:00
Ryan Bloom
ff544b0605 Update the version name in the tree for 2.0a2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84883 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 19:52:18 +00:00
Roy T. Fielding
2a98ce1a7a Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84877 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 07:19:05 +00:00
Manoj Kasichainula
98ebd36301 Eliminate src/apaci, and replace with a header file containing paths:
include/ap_config_path.h.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84871 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 02:38:33 +00:00
Ryan Bloom
69ad445e8b Fix the warnings associated with the pre_config patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84864 13f79535-47bb-0310-9956-ffa450edef68
2000-03-30 18:39:46 +00:00
Ryan Bloom
3fa139e050 Put the pre_config hook back into the table. This solves the problem of
the pre-config hook only being valid for MPM's.  This patch also
distinguishes between STANDARD modules and MPM's.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84862 13f79535-47bb-0310-9956-ffa450edef68
2000-03-30 15:30:36 +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
Allan K. Edwards
789a32d2f1 Clear hook registrations between reads of the config file.
When DSOs are unloaded and re-loaded the old hook pointers may
no longer be valid. This fix eliminates potential segfaults.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84828 13f79535-47bb-0310-9956-ffa450edef68
2000-03-23 14:48:45 +00:00
Brian Havard
797eb4b036 Bring forward my recent 1.3 patches.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84802 13f79535-47bb-0310-9956-ffa450edef68
2000-03-20 02:42:20 +00:00
Brian Havard
66b5916e89 Test for AP_USE_HSREGEX, not USE_HSREGEX, as that's what actually gets
defined (in ap_config_auto.h) when using the bundled hsregex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84795 13f79535-47bb-0310-9956-ffa450edef68
2000-03-19 13:28:42 +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
Dirk-Willem van Gulik
99a9d6e3e0 Another one in the department of fairly useless patches which
are best described as feature creep. Allows ${ENV} constructs
in the config file. This avoids the need for mod_perl or
m4 cleverness whilst mainting some of the usefullness. It
does not do (of course) multiline things or anything that clever.

Feel free to flame me.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84765 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 14:09:52 +00:00
dgaudet
3b69cd61f7 more missing from css
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84761 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 08:01:46 +00:00
dgaudet
e5a4cff18f missing from css patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84760 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 07:58:12 +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
28b878572c Update the version string to reflect that we are currently working on
Apache/2.0a2-dev.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84750 13f79535-47bb-0310-9956-ffa450edef68
2000-03-13 18:53:22 +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
Bill Stoddard
3930dd3c0f Temporary hack to fix WIN32 compiles until the autoconf induced include
file mess is fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84626 13f79535-47bb-0310-9956-ffa450edef68
2000-02-16 15:08:45 +00:00
Bill Stoddard
c70c963f8d This patch is sure to break someone!
We need to define MODULE_VAR_EXPORT, API_EXPORT, API_VAR_EXPORT, et. al.
in an os specific way and the definitions need to be done as soon as possible
in the include file chain. I choose to use os.h as the preferred mechanism
for doing this (for now anyway) since this is they way it was done for
Apache 1.3. win32/os.h and unix/os.h probably have some Apache private macro
definitions that are being exposed publicly because of this patch. The solution
to this problem is to remove the private definitions from os.h.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84551 13f79535-47bb-0310-9956-ffa450edef68
2000-02-01 21:05:45 +00:00
Martin Kraemer
240ecfae8d The 'canonical' name for this #define (as of Configure, ap_config_auto.h) is USE_HSREGEX
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84549 13f79535-47bb-0310-9956-ffa450edef68
2000-02-01 00:06:14 +00:00
Bill Stoddard
b97e24e81e Add back the script_interpreter_source code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84505 13f79535-47bb-0310-9956-ffa450edef68
2000-01-21 18:42:45 +00:00
Bill Stoddard
620c82bd75 Back out most of the last commit. Keep APR macros seperate from Apache
macros.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84504 13f79535-47bb-0310-9956-ffa450edef68
2000-01-21 01:25:25 +00:00
Bill Stoddard
6be94dea6d Convert HAVE_NETINET... to the APR mac
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84503 13f79535-47bb-0310-9956-ffa450edef68
2000-01-20 22:14:15 +00:00
Ryan Bloom
505fa49a3a Manoj has been pushing for this for a while, but I've been too dense
to understand that he was right.  :-)  Basically, this makes the modules
use ap_config to test for header file inclusion.  This method is not to
be used for larger modules that run autoconf theirselves.  Including
ap_config is only valid for modules which rely on Apache to do their
configuration.  Currently, this is only the core modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84497 13f79535-47bb-0310-9956-ffa450edef68
2000-01-19 02:42:17 +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
Ryan Bloom
6786681590 Get rid of ap_call_exec. It has been #if 0'ed out for a long time, and we
never call it, so I'm taking it out all together now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84377 13f79535-47bb-0310-9956-ffa450edef68
1999-12-31 01:27:43 +00:00
rasmus
191c4462f1 Submitted by: Sascha Schumann <sascha@schumann.cx>
Reviewed by:	Rasmus Lerdorf

    -   INADDR_NONE is not defined. Supply a replacement
    -   APACHE_MODULE() used a non-portable shell construct
    -   inet_addr() needs -lnsl -lsocket. Neccessary checks added
    -   For POSIX conformance, _POSIX_PTHREAD_SEMANTICS is
        required. This fixes i.e. sigwait() problems.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84367 13f79535-47bb-0310-9956-ffa450edef68
1999-12-24 18:40:27 +00:00