www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-14 01:22:37 +03:00
Code Activity
26,419 Commits 62 Branches 304 Tags
1755dc97033f4c7129f1f8c9380510517c7005a4
Commit Graph

80 Commits

Author SHA1 Message Date
Christophe Jaillet
845a77beca Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578759 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-18 06:51:49 +00:00
Jan Kaluža
7d473bfd8f mod_proxy_ajp: remove AJP_EBAD_METHOD, it is not used since r1435178 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560269 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-22 07:40:28 +00:00
Jim Jagielski
bb76893cfb We were not being consistent between http and others 
if we added the default port or not during the canonizing
phase... Baseline the http method (don't add unless the
port provided isn't the default).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542562 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-16 20:13:48 +00:00
Jim Jagielski
6284650f6d ping tuning via Yann Ylavic <ylavic.dev@gmail.com> 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530603 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 13:38:45 +00:00
Jeff Trawick
619866c198 fill in missing message numbers in APLOGNO() invocations 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1524018 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-17 12:51:08 +00:00
Jim Jagielski
058ebfc8c3 typo 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1516965 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-23 18:18:51 +00:00
Jim Jagielski
357828f9d2 Allow for a simple socket check in addition to the 
higher level protocol-level checks for backends...

Not sure if it makes sense to do both or not... Comments?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1516930 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-23 16:48:42 +00:00
Daniel Ruggeri
d31632f33c Add failontimeout to allow server admin to mark balancer member in err if IO timeout occurs. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1465839 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 00:18:42 +00:00
Ruediger Pluem
6dd8e07528 * If we face a timeout during receiving the response from the backend and if 
we pinged it successfully before don't assume the whole backend has failed.
  Assume that only the request has failed and return a gateway timeout then.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1398307 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-15 14:38:04 +00:00
Rainer Jung
4cf751dbb9 Fix closing the back end connection in case of error. 
The field "closed" was changed from an int to a bit
field of size one in 2.4.x.
For historical reasons a close instruction was coded
as an increment on the field, which in 2.4.x flips
the field each time. There were mutliple code paths
that would flip it several times for a single error,
so effectively the connection was no longer closed
in these cases.

Especially in the case of an aborted client connection
this lead to a non consumed back end buffer and thus to
response mixup between users.

PR 53727

CVE-2012-3052


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1373955 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-16 17:54:50 +00:00
Stefan Fritsch
f23a12fb76 Use short lived pool to avoid memory leaks 
Remove the comment about binding upstream and downstream connections. It
seems to be obsolete since r104604, r104605, r105108.

Also avoid allocating memory if we are not handling the connection.

PR: 52275
Submitted by: Naohiro Ooiwa <naohiro ooiwa miraclelinux com>, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1334343 13f79535-47bb-0310-9956-ffa450edef68
 2012-05-05 08:30:39 +00:00
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 23:02:04 +00:00
Stefan Fritsch
b56ba5a823 More ap_log_rerror() usage and axe some more AJP: prefixes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203878 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 22:02:27 +00:00
Stefan Fritsch
8ec7f5c5bf great proxy logging cleanup: 
* remove "proxy:", "FCGI", etc. prefixes and pid which are now
    included in the error log format

  * propagate frontend request's logconfig to backend request
    
  * use ap_log_rerror where possible
    
  * remove obsolete APLOG_NOERRNO


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203859 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 21:41:09 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push: 
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 13:39:32 +00:00
Jean-Frederic Clere
17d779bff4 Use HTTP_NOT_IMPLEMENTED instead of HTTP_BAD_REQUEST. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166657 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-08 12:41:30 +00:00
Jean-Frederic Clere
7fa4862380 AJP_EBAD_METHOD is also a bad request so return HTTP_BAD_REQUEST 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1166551 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-08 07:45:40 +00:00
Ruediger Pluem
c0ac7adb66 * Do not even sent an empty brigade down the filter chain if the headers 
have not been sent by the AJP server so far. Even an empty brigade
  will trigger the headers filter to create the (in this case incomplete)
  HTTP headers of the response.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1153531 13f79535-47bb-0310-9956-ffa450edef68
 2011-08-03 15:07:29 +00:00
Rainer Jung
966df72b7c Improve logging for mod_proxy_ajp. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152452 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-30 10:58:34 +00:00
Rainer Jung
73cf5b7f29 mod_proxy_ajp: Respect "reuse" flag in END_REPONSE 
packets.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152379 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-29 21:41:00 +00:00
Eric Covener
7ae5a61329 replace recent AJP direct comparisons to APR_TIMEUP with APR_STATUS_IS_TIMEUP. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1100513 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-07 11:41:59 +00:00
Guenter Knauf
e35a1a09d2 Fixed missing struct member error introduced with r1092076. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092212 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-14 13:05:48 +00:00
Jean-Frederic Clere
6794d36d02 try to prevent a single long request marking a worker in error. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1092076 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-14 09:36:14 +00:00
Jim Jagielski
b8d9a25867 *) mod_proxy_ajp: Add support for 'ProxyErrorOverride on'. PR 50945. 
[Peter Pramberger <peter pramberger.at>, Jim Jagielski]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087864 13f79535-47bb-0310-9956-ffa450edef68
 2011-04-01 19:25:26 +00:00
Jim Jagielski
201bbd1ba9 More movement to shared stuff... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1058623 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-13 15:58:57 +00:00
Jean-Frederic Clere
5bccbb504f Don't log errors when we can't send to client, just debug. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@986591 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-18 08:31:36 +00:00
Jeff Trawick
291d4c641c comment fixes for "send" vs. "sent" 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@983056 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-06 17:04:40 +00:00
Ruediger Pluem
53c2b55947 * Ensure that we only return a non fatal error if the request is idempotent 
and if we did not sent any request body so far.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@955966 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-18 12:22:13 +00:00
Ruediger Pluem
1541eb4e2d * Use APR_STATUS_IS_TIMEUP instead of direct compare to APR_TIMEUP to 
be more safe on different platforms.

Pointed out by: rjung


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953385 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-10 16:46:35 +00:00
Stefan Fritsch
01b9f2e551 - Be less verbose at levels INFO and DEBUG in mod_proxy* and mod_ssl 
- Add some trace logging to core and http


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951900 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 17:07:12 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take 
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 16:59:50 +00:00
William A. Rowe Jr
29525f5d2c SECURITY: CVE-2010-0408 (cve.mitre.org) 
mod_proxy_ajp: Respond with HTTP_BAD_REQUEST when the body is not sent after
request headers indicate a request body is incoming; this is not a case of
HTTP_INTERNAL_SERVER_ERROR.

Submitted by: Niku Toivola <niku.toivola sulake.com>
Reviewed by: rpluem, jim, wrowe



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@917875 13f79535-47bb-0310-9956-ffa450edef68
 2010-03-02 04:46:13 +00:00
Ruediger Pluem
263547b8e4 * Really regard the operation a success, when the client aborted the connection. 
In addition adjust the log message if the client aborted the connection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@911466 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-18 16:11:11 +00:00
Daniel Earl Poirier
e43f032844 Make comment agree with code. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@820036 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-29 17:27:56 +00:00
Ruediger Pluem
1704a79477 * Check more strictly that the backend follows the AJP protocol. 
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@764239 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-11 19:49:12 +00:00
Ruediger Pluem
b6b2ba9ef2 * Avoid delivering content from a previous request which failed to send a request 
body by closing the connection to the backend in this case instead of reusing it.

CVE: CVE-2008-5519
PR: 46949
Reviewed by: jim, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@763394 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-08 21:06:46 +00:00
Ruediger Pluem
07e868589e * Use distinct char pointers for sending and receiving buffers to avoid 
destroying the pointer to the sending buffer in the ajp message if
  data is received from the backend before all data is sent to the
  backend.

PR: 45911


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@709666 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-01 10:23:09 +00:00
Ruediger Pluem
75fdb89d40 * There are no subrequests which have itself as parent. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707027 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-22 10:40:55 +00:00
Jean-Frederic Clere
5dd3bee230 ap_proxy_determine_connection modifies the url if we are retrying the result we should retry using the orginal url. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@706318 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-20 15:11:05 +00:00
Mladen Turk
e2eac36201 Always send body (zero size at least) whenever C-L is present in the request 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@696614 13f79535-47bb-0310-9956-ffa450edef68
 2008-09-18 09:35:30 +00:00
Ruediger Pluem
a5ce4c218b * If CPING fails retry once more with a fresh TCP connection. If this fails 
as well give up.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@693392 13f79535-47bb-0310-9956-ffa450edef68
 2008-09-09 07:25:56 +00:00
Ruediger Pluem
fd0f91e363 * Introduce a flag to decide whether we sent an body to the backend or not. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@660207 13f79535-47bb-0310-9956-ffa450edef68
 2008-05-26 15:04:55 +00:00
Jim Jagielski
b86ddabbef Set at init time, and combine comments 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649922 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-20 14:23:25 +00:00
Ruediger Pluem
990f2aafc4 * Do not add the query string again in the case that we are using the 
unparsed uri.

PR: 44803


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649840 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-19 18:48:05 +00:00
Jim Jagielski
aa2cf4597d handle ? in cases where nocanon is in effect 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649239 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-17 19:20:16 +00:00
Jim Jagielski
a10d494e08 Make mod_proxy_ajp aware of the nocanon envvar 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649169 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-17 16:22:36 +00:00
Jean-Frederic Clere
4bcbc37a4c Remove useless test. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@641837 13f79535-47bb-0310-9956-ffa450edef68
 2008-03-27 14:44:19 +00:00
Ruediger Pluem
eeca2b5914 * As per niq's comment, better destinct the types of idempotence. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@627097 13f79535-47bb-0310-9956-ffa450edef68
 2008-02-12 20:51:08 +00:00
Ruediger Pluem
9af3a4cdfd * Do not retry a request in the case that we either failed to sent a part of the 
request body or if the request is not idempotent.

PR: 44334


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@617822 13f79535-47bb-0310-9956-ffa450edef68
 2008-02-02 16:35:40 +00:00
Jim Jagielski
a067e75531 Ignore any ajp13 flush messages which we may mistakenly 
rec' before we send the response headers. See
Tomcat PR 43478.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@579707 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-26 16:11:07 +00:00