1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

952 Commits

Author SHA1 Message Date
Roy T. Fielding
3dfd8e0dc3 Modifications to make mod_unique_id thread safe. This should work on Windows,
but no guarantees.  I haven't verified it will always give a unique ID, but
the logic is good.  I'll write some test cases to see if I can make it fail
later.

Submitted by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83789 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 17:22:35 +00:00
Roy T. Fielding
dc349534f3 Remove timeouts as part of pthreads changes.
Submitted by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83788 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 17:17:22 +00:00
Roy T. Fielding
3c42b1acf0 Extra bit left off of hook additions.
Submitted by:	Ben Laurie


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83787 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 17:11:08 +00:00
Roy T. Fielding
9f817aa324 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@83786 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 17:09:12 +00:00
Roy T. Fielding
aa9f315839 Add prototype for ap_select on OS/2
Submitted by:	Brian Havard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83785 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:54:14 +00:00
Roy T. Fielding
174302fd22 More MPM changes. Remove NO_OTHER_CHILD defines.
Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83784 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:52:53 +00:00
Roy T. Fielding
e7fd96857e Special Support for User-Space Threading Environments
Submitted by:	Ralf S. Engelschall


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83783 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:49:14 +00:00
Roy T. Fielding
d747e338c8 More MPM changes. Remove ap_can_exec and add a couple prototypes.
Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83782 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:43:56 +00:00
Roy T. Fielding
08ef8a49fe Optimize ap_make_dirstr_prefix().
Submitted by:	Manoj Kasichainula


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83781 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:37:41 +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
c6ba43b62e Replace SIGUSR1 with SIGWINCH
Submitted by:	Manoj Kasichainula


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83777 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:04:13 +00:00
Roy T. Fielding
49d31d395e TODO: re-implement SAFEREAD external to BUFF using a layer
Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83776 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 16:02:06 +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
17f845566f Faster versions of ap_gm_timestr_822() and ap_unescape_url().
Submitted by:	Manoj Kasichainula


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83774 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 15:47:49 +00:00
Roy T. Fielding
2bdb308996 FIXME: These changes are just errors from bad merges in the past.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83773 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 15:17:10 +00:00
Roy T. Fielding
c5a36ee6c2 This evil little change modifies the interface to ap_parseHTTPdate()
for no good reason.  It'll be backed out real soon.

Submitted by:	pthreads leftovers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83772 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 14:53:24 +00:00
Roy T. Fielding
1fa9e10844 Sorry, but using C comments in place of C++ comments
makes life for me and my compiler much easier.

This one should be back-ported to Apache 1.3.10-dev

Submitted by:	Martin Kraemer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83771 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 14:37:39 +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
Roy T. Fielding
a8203308d9 Changes from pthreads. Removes timeouts, adds mutex.
This probably breaks the proxy on everything but pthreads.

Submitted by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83769 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 14:15:07 +00:00
Roy T. Fielding
8f30e699f7 Removed timeouts.
Submitted by:	Bill Stoddard, Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83768 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 14:11:38 +00:00
Roy T. Fielding
fb1bab0f1a user and ap_auth_type fields were moved from connection_rec to request_rec
Submitted by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83767 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 13:57:37 +00:00
Roy T. Fielding
19bca355c1 Replace all alarms and timeouts with a mutex on alloc.
Replace file descriptors with APRFile.
Add ap_is_aborted macro.

Submitted by:	Bill Stoddard, Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83766 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 12:54:16 +00:00
Roy T. Fielding
4ada3bf91b Parts where server was eliminated from connection rec.
Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83765 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 12:13:02 +00:00
Roy T. Fielding
3686d94fed Removed RLIMIT stuff, supposedly to be implemented later in mod_cgi.
Disabled suexec, supposedly to be reimplemented later.

Submitted by:	Bill Stoddard, Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83764 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 12:02:31 +00:00
Roy T. Fielding
bab4dcb050 Rearchitect the mess in http_main.c, http_core.c and buff.c.
Basic restructuring to introduce the MPM concept; includes various
changes to the module API... better described by docs/initial_blurb.txt.

Created multiple process model (MPM) concept by ripping out the process
guts from http_main.c and http_core.c and moving them to separate files
under src/modules/mpm/

Moved socket creation stuff to listen.c.
Moved connection open, maintenance and close to http_connection.c.

I/O layering and BUFF revamp.  Much of buff.c moved to ap_iol,
iol_socket, and iol_file.  See docs/buff.txt.

Moved user and auth fields from connection_rec to request_rec.
Removed RLIMIT stuff, supposedly to be implemented later in mod_cgi.
Disabled suexec, supposedly to be reimplemented later.

Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83763 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 10:45:57 +00:00
Roy T. Fielding
b09d9fa1cc Replace file descriptor with APRFile [Dean]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83762 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 07:21:44 +00:00
Roy T. Fielding
96f8ecb70b A run alias for personal use.
Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83761 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 06:23:55 +00:00
Roy T. Fielding
c238bb5b83 Make process model directives conditional based on MPM module.
Add examples for each MPM.

Submitted by:	Dean Gaudet, Ralf S. Engelschall


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83760 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 05:17:40 +00:00
Roy T. Fielding
1e5896704a Reduce default MaxClients for testing MPM.
[This file is probably obsolete  -- Roy]

Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83759 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 05:13:00 +00:00
Roy T. Fielding
667853950e Update Lars' key
Submitted by:	Lars Eilebrecht


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83756 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 05:05:16 +00:00
Dirk-Willem van Gulik
77e1c3dc1d Blush.. this should have been removed long ago. Stumbled across
it whilst trying to write a quick parser to get some well formed
or meaningfull semantics to then have XML or SGML to play with..
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83753 13f79535-47bb-0310-9956-ffa450edef68
1999-08-25 12:49:22 +00:00
Roy T. Fielding
e3e87d34a0 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83751 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 06:55:44 +00:00
Roy T. Fielding
6f96ad5227 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83750 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 06:46:03 +00:00
Roy T. Fielding
ef31f58424 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83749 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 05:50:50 +00:00
Roy T. Fielding
77c2776832 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83748 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 05:34:15 +00:00
Bill Stoddard
77acd90f25 Forgot listen.c in the earlier AcceptEx patch to winnt.c.
Enable winnt mpm to detech OS at runtime.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83743 13f79535-47bb-0310-9956-ffa450edef68
1999-08-21 04:43:15 +00:00
Bill Stoddard
f00de85778 Use AcceptEx (a.k.a. accept and receive) on windows NT. Begin work to make
the WIN9x code co-exist with the NT specific code. Since I started this work,
I've managed to improve the static page serving performance of Apache on NT by
almost 50%. Still a long way from Apache on Linux though.

TODO:
- Reuse the AcceptEx accept socket (performance)
- Clean up the organization of the winnt mpm
- Implement Async AcceptEx and Receive. Will this break modules?
- File handle cache (file i/o accounts for more than 50% of the time per request)
- TransmitFile (I have prototype code implemented). Should we add a send_file API
to the I/O control layer? Maybe Apache should always try to send_file. Platforms
that don't support send_file could in turn, invoke the appropriate buff code
which would then invoke socket iol write/writev.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83739 13f79535-47bb-0310-9956-ffa450edef68
1999-08-20 20:20:33 +00:00
Ken Coar
620daec03c Spell it out in words of half a syllable. Some people..!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83734 13f79535-47bb-0310-9956-ffa450edef68
1999-08-19 21:52:01 +00:00
Manoj Kasichainula
d069a6ea00 Move the code to force Expat linking into common code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83713 13f79535-47bb-0310-9956-ffa450edef68
1999-08-17 22:05:17 +00:00
Manoj Kasichainula
81838ad98e merge the differences in apache-1.3 from tag mpm-merge-1 up to
APACHE_1_3_9 (a.k.a. mpm-merge-2) onto the mpm tree

prior to the merge, the mpm tree was tagged with apache-1_3-merge-2-pre,
and after the merge, the mpm tree will be tagged with
apache-1_3-merge-2-post


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83709 13f79535-47bb-0310-9956-ffa450edef68
1999-08-17 20:59:29 +00:00
Bill Stoddard
e58d38b8ca More cleanup...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83708 13f79535-47bb-0310-9956-ffa450edef68
1999-08-17 19:51:43 +00:00
Bill Stoddard
7c427a464c Server will build and serve static pages (page size < bufsize) with the appropriate makefile hacks (remove mod_cgi, mod_include, etc.).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83703 13f79535-47bb-0310-9956-ffa450edef68
1999-08-16 22:36:25 +00:00
Ben Laurie
955bb544fe Get case indent right.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83690 13f79535-47bb-0310-9956-ffa450edef68
1999-08-15 21:55:19 +00:00
Ralf S. Engelschall
335b6ab2fc Unbreak dexter and pthread MPM after Ben's latest hook changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83686 13f79535-47bb-0310-9956-ffa450edef68
1999-08-15 11:02:44 +00:00
Roy T. Fielding
f98f4f4636 The current documentation on the Rlimit{CPU,MEM,Nproc} directives
uses the wording "for all processes", which leads one to believe that
the limit applies to all of the Apache children processes.
However, this is not the case. The resource limits are applied in
ap_call_exec() which is only called by mod_cgi and mod_include.

Submitted by:	David Harris <dharris@drh.net>
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83682 13f79535-47bb-0310-9956-ffa450edef68
1999-08-15 06:55:48 +00:00
Ben Laurie
9cbf7240db Fix formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83681 13f79535-47bb-0310-9956-ffa450edef68
1999-08-15 00:15:44 +00:00
Ben Laurie
78847f9190 Child initializer hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83680 13f79535-47bb-0310-9956-ffa450edef68
1999-08-15 00:11:18 +00:00
Ben Laurie
9aecb9f843 Auth checker hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83679 13f79535-47bb-0310-9956-ffa450edef68
1999-08-15 00:01:25 +00:00