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

15181 Commits

Author SHA1 Message Date
Brian Pane
6b1a2caf76 Return APR_EAGAIN instead of SSL_ERROR_WANT_READ from the mod_ssl filters;
the httpd core and other modules' filters don't know what SSL_ERROR_* means.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371484 13f79535-47bb-0310-9956-ffa450edef68
2006-01-23 08:04:01 +00:00
Brian Pane
dd03ca80d7 reverting vetoed commit r371227
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371415 13f79535-47bb-0310-9956-ffa450edef68
2006-01-22 23:06:24 +00:00
Brian Pane
aaa2b904f0 Force blocking reads in mod_ssl when running in an async MPM
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371227 13f79535-47bb-0310-9956-ffa450edef68
2006-01-22 07:40:47 +00:00
Brian Pane
3f4ff35895 don't conceal EAGAIN in READBYTES mode
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371218 13f79535-47bb-0310-9956-ffa450edef68
2006-01-22 06:34:50 +00:00
Brian Pane
97993a7eb8 Buffer partial lines within ap_core_input_filter() when doing
AP_MODE_GETLINE reads on a nonblocking connection


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@371175 13f79535-47bb-0310-9956-ffa450edef68
2006-01-22 03:35:46 +00:00
Brian Pane
8240f8566e Avoid setting r->the_request to NULL if the client sends too many blank lines.
Also, remove a bit of debug code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@366996 13f79535-47bb-0310-9956-ffa450edef68
2006-01-08 06:41:34 +00:00
Brian Pane
44e2e27bcf Initial implementation of asynchronous read completion for Event MPM
Warning: SSL doesn't work, so these changes aren't ready to be merged
to the trunk yet.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@365346 13f79535-47bb-0310-9956-ffa450edef68
2006-01-02 13:43:42 +00:00
Brian Pane
fca35efc30 Added ap_read_async_request()...
At the moment, asynchronous MPMs still read the request headers
with the connection in blocking mode.  To enable asynchronous
read completion, we'll need to make some changes in the Event MPM.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@353904 13f79535-47bb-0310-9956-ffa450edef68
2005-12-04 20:38:25 +00:00
Brian Pane
5a5c259bf4 Free a temporary brigade in read_partial_request()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@353838 13f79535-47bb-0310-9956-ffa450edef68
2005-12-04 09:36:06 +00:00
Brian Pane
97600b2bfc Remove old code that was ifdef'ed out in the last commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@353829 13f79535-47bb-0310-9956-ffa450edef68
2005-12-04 07:34:28 +00:00
Brian Pane
466fc8c3d1 Further cleanup of ap_get_mime_headers_core()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@353828 13f79535-47bb-0310-9956-ffa450edef68
2005-12-04 07:29:51 +00:00
Brian Pane
730ef8141b More refactoring: replace half of ap_get_mime_headers_core() with a
call to set_mime_header()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@353825 13f79535-47bb-0310-9956-ffa450edef68
2005-12-04 06:53:53 +00:00
Brian Pane
5a780de12f Fix the handling of HTTP/0.9 requests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@353810 13f79535-47bb-0310-9956-ffa450edef68
2005-12-04 04:07:15 +00:00
Brian Pane
1ef98fc182 Fix the detection of request header limit errors in the refactored
ap_read_request()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@352060 13f79535-47bb-0310-9956-ffa450edef68
2005-12-04 02:15:53 +00:00
Brian Pane
c61648c626 More refactoring of ap_read_request() in preparation for
nonblocking read support.

WARNING: The code for handlng requests that exceed the field-length
or number-of-fields limits isn't complete in this commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@349348 13f79535-47bb-0310-9956-ffa450edef68
2005-11-28 02:56:47 +00:00
Brian Pane
0ec6ef5f53 When computing the timeouts for keepalives and write completion,
get the current time _after_ processing the event that led to the
timeout, rather than before.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@349189 13f79535-47bb-0310-9956-ffa450edef68
2005-11-27 07:31:48 +00:00
Brian Pane
3de967a73d Refactor ap_read_request() to separate the parts that do socket reads
from the parts that update the request_rec.  This is a step towards
nonblocking, event-driven read support.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@349068 13f79535-47bb-0310-9956-ffa450edef68
2005-11-26 03:20:52 +00:00
Brian Pane
e71a2d89f2 new branch for experimenting with nonblocking reading of requests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-read-dev@345727 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 08:10:53 +00:00
Brian Pane
58d941233a remove an obsolete comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345726 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 07:40:49 +00:00
Paul Querna
14b0d1ed02 rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345709 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 02:02:09 +00:00
Paul Querna
ef6bb19dc9 Fix program name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345708 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 01:57:58 +00:00
Paul Querna
3908f38c17 rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345702 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 01:36:27 +00:00
Paul Querna
d8de7f48c5 Add a mention of the new httxt2dbm program
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345701 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 01:33:27 +00:00
Ruediger Pluem
e6e065d38c * Minor performance tweak by reusing already calculated strlen in get_body.
Submitted by: Christophe Jaillet <christophe.jaillet wanadoo.fr>
Reviewed by: Ruediger Pluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345686 13f79535-47bb-0310-9956-ffa450edef68
2005-11-19 20:59:16 +00:00
André Malo
93400c71aa fix eol-style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345558 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 20:03:51 +00:00
André Malo
f6f438669b update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345550 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 19:43:42 +00:00
André Malo
150fe462a6 fix properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345549 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 19:38:21 +00:00
Nick Kew
a7a0d0984c Add typemap file to mod_authz_dbd docs (oops!)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345393 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 00:48:16 +00:00
Nick Kew
2a8930b652 Note mod_authz_dbd in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345392 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 00:46:11 +00:00
Nick Kew
7d02f7d410 Documentation for mod_authz_dbd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345391 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 00:43:41 +00:00
Nick Kew
5dbbe6d499 mod_authz_dbd: SQL authz with Login/Session support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345389 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 00:42:08 +00:00
Joshua Slive
5b5e981804 Remove redundant link.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345302 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 18:31:47 +00:00
Joshua Slive
acae04e76a * Deprecate AddOutputFilterByType
* Link up Require and AuthType to the relevant aaa modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345301 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 18:29:41 +00:00
Joshua Slive
efcaa3cf9b A few markup and spelling fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345298 13f79535-47bb-0310-9956-ffa450edef68
2005-11-17 18:24:09 +00:00
Nick Kew
54c8162ce5 Add defaults and comments for better robustness against misuse
(based on comments from Chris Darroch).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345128 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 21:20:33 +00:00
André Malo
3c2f47f46c update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345067 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 17:38:52 +00:00
Joshua Slive
182dbb394c Provide at least a basic roadmap to the aaa modules as part of the tutorial.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345065 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 17:24:48 +00:00
Joshua Slive
586be46115 Remove on/off arguments from AuthDigestProvider.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345064 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 17:23:46 +00:00
Joshua Slive
5f3be4a711 Remove on/off from the argument list for AuthBasicProvider,
attempt to clarify the discussion of AuthBasicAuthoritative,
and add some extra clarifications in a few places.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345057 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 16:40:57 +00:00
Justin Erenkrantz
2797b883ca Remove support for 'On' and 'Off' for AuthBasicProvider and AuthDigestProvider
as it doesn't actually work as advertised.

Reviewed by: Joshua Slive (concept)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345054 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 16:35:49 +00:00
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
Colm MacCarthaigh
609d0155e2 Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345045 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 15:56:13 +00:00
Nick Kew
dcb0ab5158 Fix (Chris Darroch) to register cleanup for persistent connection
in the no-threads case.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@345040 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 15:30:32 +00:00
Colm MacCarthaigh
52bb0474fe Correct an XML validation error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344972 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 10:25:30 +00:00
Colm MacCarthaigh
6a6b021d1a Make references to 2.1 and later consistent with each other.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344971 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 10:23:56 +00:00
Jeff Trawick
3a67f28030 Fix typo in ProxyStatus syntax error message.
Submitted by: Christophe Jaillet <christophe.jaillet wanadoo.fr>
Reviewed by:  trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344491 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 01:31:44 +00:00
Nick Kew
baf1683bd3 Fix wrong link
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344485 13f79535-47bb-0310-9956-ffa450edef68
2005-11-16 00:07:30 +00:00
Jim Jagielski
29d8e63bbd Backported the UCPP code to 2.2 branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344421 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 19:56:24 +00:00
Joshua Slive
78cfb5f4c6 Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344411 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 18:58:23 +00:00
Joshua Slive
988b8d67ad Remove a few obsolete historical references, clean up
some small inconsistencies, and use graceful-stop in
the upgrading example.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344409 13f79535-47bb-0310-9956-ffa450edef68
2005-11-15 18:41:10 +00:00