www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
15,181 Commits 62 Branches 313 Tags
async-read-dev
Commit Graph

185 Commits

Author SHA1 Message Date
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
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
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
Greg Ames
374a607001 keep the proxied Content-Length header for a HEAD response. PR 18757 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@327008 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-20 21:42:50 +00:00
William A. Rowe Jr
7e2a5490d1 NET_TIME, as a standalone feature, was a horrid idea. 
The core filter will NOT operate correctly across platforms 
  (even between Linux/Solaris) without setting up the conn->timeout,
  so always apply the timeout when establishing the core filter.

  The keep-alive-timeout is entirely an HTTP-ism, and needs to
  move to the http protocol handler.  Note #1; this isn't triggered
  in the event mpm, but the event mpm introspects s->keep_alive_timeout
  directly adding it to the pollset, so this is a non-sequitor.

  Finally, once the headers are read, the named virtual host may
  have a different (more/less permissive) timeout for the remainder
  of the request body.  This http-centric patch picks up that subtle
  detail and can switch to a named-vhost timeout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@306495 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-06 01:29:42 +00:00
William A. Rowe Jr
62d58df5ca Pay close attention to core_create_req() ... and note 
that not one other member of the r->vars is initialized
  herein.  Move this initialization elsewhere.

  (If this is the 'default' - it really aught to be the
  zero value, for that matter).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@295141 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-05 23:37:53 +00:00
Joe Orton
ba2f28e54d * server/protocol.c (ap_read_request): Remove the Content-Length 
header if any Transfer-Encoding header is present, regardless of
value.

Reviewed by: Paul Querna, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@193122 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-23 09:36:16 +00:00
Jean-Frederic Clere
383bae1ebc if Transfer-Encoding is not "identity" ignore Content-Length. 
otherwise ajp-proxy hangs when Transfer-Encoding is "chunked".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@191175 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-17 16:47:43 +00:00
Paul Querna
357706a870 If a request contains both a T-E and C-L, remove the C-L, stopping some HTTP Request Smuggling attacks exploited when using HTTPD as a forward or reverse proxy. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@191005 13f79535-47bb-0310-9956-ffa450edef68
 2005-06-16 21:34:08 +00:00
Joe Orton
b90c24d243 * server/protocol.c (read_request_line): Revert addition of error 
message which triggers every time dummy_connection() is used to wake
up a child.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170433 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-16 19:36:04 +00:00
Jeff Trawick
7ae218a5bf Support the suppress-error-charset setting, as with Apache 1.3.x. 
With Apache 1.3.x, it is a bit simpler as the request does
not go through ap_make_content_type().

Modules can set custom error responses but not be able to
set the charset, so they have to code the charset in the
html.  Thus, it is useful to preserve 1.3.x behavior exactly.

PR: 26467


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170354 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-16 10:41:42 +00:00
Greg Ames
6eabfd6c6a use a more general but slightly slower test for a body. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@160573 13f79535-47bb-0310-9956-ffa450edef68
 2005-04-08 18:07:33 +00:00
Greg Ames
2b3ad91040 clone_headers_no_body: remove all entity headers in addition to the 
Transfer-Encoding header when creating a GET subrequest



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159410 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-29 18:24:46 +00:00
Greg Ames
235fd33d8f don't propagate input headers describing a body to a subrequest. this can cause a 
back end server to hang in a read for a body which no longer exists.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@158798 13f79535-47bb-0310-9956-ffa450edef68
 2005-03-23 16:36:45 +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
William A. Rowe Jr
6b27462b2f limit_req_fieldsize is signed, correct a signedness error using 
a cast since it's not possible to have a negative limit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@124283 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-05 22:21:56 +00:00
William A. Rowe Jr
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME! 
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
 2005-01-02 05:33:44 +00:00
Bradley Nicholes
694a529c09 Revert patch r104923. This patch doesn't actually fix bug 18757 and 
breaks TLS upgrade functionality.  Also, removing the content length for
HEAD requests is being handled in ap_http_header_filter().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@110141 13f79535-47bb-0310-9956-ffa450edef68
 2004-12-07 19:04:22 +00:00
Joe Orton
4ddf48af17 Fix for memory consumption DoS, CVE CAN-2004-0942: 
* server/protocol.c (ap_rgetline_core): Don't trim trailing whitespace
from the buffer here.
(ap_get_mime_headers_core): Trim trailing whitespace here, after
reading a complete field including continuation lines.  Also simplify
code to remove whitespace between field-name and colon.

Reviewed by: Andr�� Malo, Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105680 13f79535-47bb-0310-9956-ffa450edef68
 2004-11-04 14:50:31 +00:00
Paul Querna
01148487b7 Use a more descriptive error message, and make it an INFO insteead of NOTICE. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105593 13f79535-47bb-0310-9956-ffa450edef68
 2004-10-25 15:59:43 +00:00
Nick Kew
d1c714c4f9 PR: 31875 
Fix URI parsing bug in case of a leading double-slash


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105586 13f79535-47bb-0310-9956-ffa450edef68
 2004-10-25 10:24:17 +00:00
Paul Querna
35e0b8cd51 This will put some messages in the error log when some people try a lame 
DoS by just opening a socket, and never sending any data.

Ivan suggested such a change about a month ago, to match the 1.3 behavoir.

Today I helped OSU's Admins figure out that someone was trying this 'attack'
against their mirror server.  The server status just showed hundreds of
Apache Children stuck in Reading.  This will at least hint to the admins
where the problem is by telling them about it in the error log.

Inspired by: Rici Lake, Ivan Ristic <ivanr webkreator.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105583 13f79535-47bb-0310-9956-ffa450edef68
 2004-10-25 06:40:08 +00:00
Roy T. Fielding
c76dd4ecef veto and revert win64 patch: 64bit changes must percolate from the 
bottom (APR/system) up -- we can't give the client a 64bit API and
then cast it to 32bits internally without introducing security holes
on other platforms.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105572 13f79535-47bb-0310-9956-ffa450edef68
 2004-10-23 22:39:53 +00:00
Allan K. Edwards
6c775f9a3c WIN64: API changes to clean up Windows 64bit compile warnings 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105545 13f79535-47bb-0310-9956-ffa450edef68
 2004-10-22 15:22:05 +00:00
Joe Orton
2b26d10798 * server/protocol.c (ap_rgetline_core): Never NUL terminate at 
(*s)[-1] for caller-supplied *s.

Submitted by: Rici Lake <ricilake speedy.com.pe>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105231 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-21 21:07:23 +00:00
Joe Orton
d05865b144 * server/protocol.c (ap_rgetline_core): Fix off-by-one. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105113 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-13 15:34:59 +00:00
Nick Kew
cf9053ecbd Fix for Bug 18757 (sending bogus content-length of zero in no-body requests) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104923 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-01 12:24:48 +00:00
William A. Rowe Jr
ef0c43088f Fix signedness emit. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104639 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-12 17:48:35 +00:00
Jeff Trawick
46ff3a2fdc CAN-2004-0493 - memory exhaustion denial of service 
Reviewed by:	jerenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104059 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-28 23:53:52 +00:00
Greg Ames
e9b7d5fefe ap_rgetline_core: insure that the output string is null terminated 
when exiting with APR_ENOSPC

Submitted by: Tsurutani Naoki <turutani scphys.kyoto-u.ac.jp>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103482 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-22 22:38:03 +00:00
André Malo
3cec2db307 ap_set_sub_req_protocol and ap_finalize_sub_req_protocol are now 
exported on Win32 as well

PR: 28523
Submitted by: Edward Rudd <eddie omegaware.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103474 13f79535-47bb-0310-9956-ffa450edef68
 2004-04-21 21:57:19 +00:00
Paul J. Reder
38d03c5274 *) Remove compile-time length limit on request strings. Length is 
now enforced solely with the LimitRequestLine config directive.
    [Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102840 13f79535-47bb-0310-9956-ffa450edef68
 2004-03-01 21:40:44 +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
Joe Orton
d78bd01cc6 * server/protocol.c (ap_rgetline_core): Fix folding if header is 
continued over more than two lines.

PR: 19405 (affects proxy only)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102414 13f79535-47bb-0310-9956-ffa450edef68
 2004-01-26 21:09:12 +00:00
Joe Orton
f5aa5e9081 * server/protocol.c (ap_rgetline_core): Re-indent function after being 
skewed by CAN-2003-0132 fix: no functional change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102413 13f79535-47bb-0310-9956-ffa450edef68
 2004-01-26 20:58:12 +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
Cliff Woolley
aaf0424e2b get rid of _FOREACH 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101788 13f79535-47bb-0310-9956-ffa450edef68
 2003-11-16 02:09:14 +00:00
Jeff Trawick
0c3c5b7145 Set the scoreboard state to indicate logging prior to running 
logging hooks so that server-status will show 'L' for hung loggers
instead of 'W'.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101517 13f79535-47bb-0310-9956-ffa450edef68
 2003-10-22 16:45:53 +00:00
Jeff Trawick
45384da23b tag the pools created for requests and subrequests 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101441 13f79535-47bb-0310-9956-ffa450edef68
 2003-10-13 23:43:00 +00:00