www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-08 04:22:21 +03:00
Code Activity
22,500 Commits 62 Branches 304 Tags
c7f1896fa72eafc46943b51a07b72634fda93ca3
Commit Graph

1417 Commits

Author SHA1 Message Date
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
Stefan Fritsch
7b3189cb8d remove more useless use of strlen 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@982046 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-03 22:06:24 +00:00
Stefan Fritsch
aa576071af - Remove a load of unused variables (or variables that are set but never read). 
- Move some declarations into the correct #ifdef scope.

I couldn't compile/test netware, but the changes look obvious enough.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@982016 13f79535-47bb-0310-9956-ffa450edef68
 2010-08-03 19:45:21 +00:00
Guenter Knauf
5e8988e256 Removed obsolete include paths from NetWare makefiles. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966904 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-22 23:38:58 +00:00
Jim Jagielski
ed67c11e05 Allow for modules to keep track of worker slot 
numbers themselves if they want, by allowing for
worker create/alloc functions to take a slot number id.
Done via _wid() variants of 3 proxy funcs.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@964089 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-14 16:03:19 +00:00
Jeff Trawick
e6fcd04001 follow up to r930125 
change log message when forcing worker into error state:
* APLOG_ERR instead of unsuppressible APLOG_NOTICE
* follow formatting of existing proxy messages more closely


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@962972 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-11 02:54:30 +00:00
Stefan Fritsch
ed451e94d1 re-order many struct members for better alignment on 64bit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@959464 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-30 22:34:05 +00:00
Stefan Fritsch
9b851ec65e - Add reallyall option to configure to build everything that can be built with 
the available libs.
- Remove redundant --with-distcache option. Simply enable distcache if
  mod_socache_dc is selected.
- Enable serf support by default if serf is available in /usr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956221 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-19 12:36:57 +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
Stefan Fritsch
6da4e2a55b Fix some compiler warnings: 
- suggest braces around empty body in an 'if' statement
- comparison of unsigned expression >= 0 is always true
- comparison of unsigned expression < 0 is always false

Please review carefully.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954641 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-14 20:55:59 +00:00
Stefan Fritsch
ed06b71981 Fix MPM event/libserf build problems: If libserf was installed during build, 
MPM event was picking up the headers but not linking with libserf, causing
unresolved symbol errors.

Now build MPM event with or without serf support depending on --with-serf
being specified or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954273 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-13 17:50:54 +00:00
Stefan Fritsch
ea8e878446 Prevent segfault if URI is missing a scheme 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953459 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-10 21:10:27 +00:00
Rainer Jung
dd92e8d0d3 Use APR_STATUS_IS_TIMEUP instead of direct compare to APR_TIMEUP to 
be more safe on different platforms.

Note: This commit has an additional, platform-independent change to
mark the back-end connection for closing ("backend->close = 1;").
That code is not required to resolve CVE-2010-2068 on any platform.

PR: 49417
Addresses CVE-2010-2068


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953418 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-10 18:52:27 +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
Stefan Fritsch
877b46df6b log issues with CONNECT at request scope instead of server scope 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951189 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-03 22:47:46 +00:00
Jeff Trawick
1477c61e6f odd assortment of spelling fixes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@947651 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 14:26:49 +00:00
Jim Jagielski
84f9080445 Move back to a post_config hook... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@936880 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-22 14:52:43 +00:00
Jean-Frederic Clere
4c4b534813 Add updatelbstatus to allow to have all the LB logic in the balancers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@936828 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-22 13:13:40 +00:00
Jim Jagielski
d9fcb8daf1 Add in BalancerNonce directive... useful for shared-secrets. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@936407 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-21 18:19:06 +00:00
Brian Havard
c6646ca325 Fix backward compatibility with APR versions less than 2.0 which don't have 
apr_socket_wait().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@933547 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-13 11:07:29 +00:00
Brian Havard
9128497953 Remove usage of the APR private function apr_wait_for_io_or_timeout(), 
replacing it with the newly added apr_socket_wait().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@933341 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-12 18:12:43 +00:00
Stefan Fritsch
871fa3dcac mod_proxy_connect: Support port ranges in AllowConnect 
PR: 23673


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@932927 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-11 15:54:02 +00:00
William A. Rowe Jr
380a1e9d08 Correct bogus code; stack alloc of variable length is not portable from C++. 
And look, there's an apr for that.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@931432 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-07 04:39:43 +00:00
Jeff Trawick
6f4c170986 small style tweaks to r930125 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930254 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-02 12:19:22 +00:00
Nick Kew
9c1c3f56d4 Proxy balancer: support setting error status according to 
HTTP response code from a backend.
PR 48939 [Daniel Ruggeri <DRuggeri primary.net>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930125 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-01 22:48:38 +00:00
Graham Leggett
481e0cadf6 mod_proxy: Tone down a warning message that appears when the same backend 
website is reverse proxied two or more times into the frontend URL space.
PR: 48947


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@925850 13f79535-47bb-0310-9956-ffa450edef68
 2010-03-21 18:18:38 +00:00
Stefan Fritsch
596940ef40 If the client disconnects and the backend continues to send data fast, forcibly 
close the backend connection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@924455 13f79535-47bb-0310-9956-ffa450edef68
 2010-03-17 20:08:42 +00:00
Stefan Fritsch
24f392484d log remote server port in various places 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@921347 13f79535-47bb-0310-9956-ffa450edef68
 2010-03-10 13:37:00 +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
Nick Kew
f28e2bdea4 mod_proxy_http: get the headers right in a HEAD request with ProxyErrorOverride.PR 41646 
Analysis by Stuart Children; patch by niq


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@912063 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-20 01:54:15 +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
Rainer Jung
d0046ecbc4 Handle the pathological case of a connect 
backend that sends us an unexpectedly huge response.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@910124 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-14 23:45:59 +00:00
Rainer Jung
92590ca5cd We need to copy the forward proxy data, because it 
might be reused during later requests using the same
backend connection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@910081 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-14 21:37:36 +00:00
Rainer Jung
8e6c0bdc8a Limit sscanf format to the number of chars actually 
needed and buffer size provided to prevent buffer overflow.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@910079 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-14 21:36:03 +00:00
Graham Leggett
2ba04c9547 mod_proxy_http: Make sure that when an ErrorDocument is served 
from a reverse proxied URL, that the subrequest respects the status
of the original request. This brings the behaviour of proxy_handler
in line with default_handler. PR 47106.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@909899 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-13 20:24:24 +00:00
Rainer Jung
8eb4de81e9 Support remote https proxies by using HTTP CONNECT. 
PR: 19188
Submitted by: Philippe Dutrueux <lilas evidian.com>
Reviewed by: rjung


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@909323 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-12 09:58:48 +00:00
Rainer Jung
6786f61f3e Fix typo in comment. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@909290 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-12 08:27:04 +00:00
William A. Rowe Jr
dc6e367a4c Add mod_serf.dsp at last, based on the patch available in; 
http://people.apache.org/~wrowe/fixserf-win32-0.3.0.patch
although there is trouble here, and pollset troubleshooting ahead.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@906327 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-04 02:43:31 +00:00
Jeff Trawick
a949ec256b fix maintainer mode ap_strstr() argument mismatch warnings 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@902245 13f79535-47bb-0310-9956-ffa450edef68
 2010-01-22 20:03:25 +00:00
Takashi Sato
92cf9b940e Move ProxyFtpDirCharset from mod_proxy to mod_proxy_ftp. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894526 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-30 00:51:46 +00:00
Takashi Sato
517aec9157 tweak handling for default allowed ports 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894430 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-29 16:25:31 +00:00
Takashi Sato
255f44600c Move AllowCONNECT from mod_proxy to mod_proxy_connect. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894425 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-29 15:39:54 +00:00
Nick Kew
103b68d409 Fix r893871 as noted by rpluem, to remove risk of returning a 
relative-ised URL, and fix erroneous CHANGES bug attribution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@893955 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-26 10:30:52 +00:00
Nick Kew
71b01f9b82 Proxy: fix ProxyPassReverse with relative URL 
PR 38864


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@893871 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-25 15:26:49 +00:00
Rainer Jung
730a42e334 Fix crash in balancer-manager. 
This was due to an incomplete refactoring in
r771940 (switching balancer->workers to an
array of pointers).

It's likely that other balancer functionality
was broken too.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@891230 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-16 13:24:51 +00:00
Guenter Knauf
14f5f18aa4 fixed NetWare proxy export list; 
only build mod_serf if we have zlib.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885766 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-01 14:24:27 +00:00
William A. Rowe Jr
3e338e488c Elaborate on low hanging XXX fruit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885689 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-01 08:44:11 +00:00
William A. Rowe Jr
6a6cc5a680 Add mod_proxy_scgi; PR 48303; Submitted by: Gregg L. Smith <lists glewis.com> 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885655 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-01 02:24:31 +00:00