01d3b428ea
* Set the error time if we set a worker in error mode.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@734703 13f79535-47bb-0310-9956-ffa450edef68
2009-01-15 13:44:23 +00:00
5c8ab974a1
use ap_log_rerror instead of r->server per niq's comments
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@733219 13f79535-47bb-0310-9956-ffa450edef68
2009-01-10 01:35:50 +00:00
f63b5a4dbd
pass a server_rec to ap_log_error on two interim response messages
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@733127 13f79535-47bb-0310-9956-ffa450edef68
2009-01-09 19:31:48 +00:00
a4b24e0aed
Remove tabs. no functional changes.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@732772 13f79535-47bb-0310-9956-ffa450edef68
2009-01-08 17:49:45 +00:00
65fa321a6c
* modules/proxy/config.m4: Remove spurious notices from configure.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730928 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 06:48:40 +00:00
8eb168a906
Use LDADD mechanism to only link mod_serf resp.
...
mod_lua to libserf resp. liblua.
No need to include this dependency in all other
modules and binaries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730876 13f79535-47bb-0310-9956-ffa450edef68
2009-01-03 00:20:14 +00:00
4f75107ee0
Use default object file in APACHE_MODULE calls
...
when possible.
It seems that's the way it is used for most modules,
so remove unnecessary explicit object file lists.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730829 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 19:43:09 +00:00
13618e8c65
Add a declaration check for CMSG_DATA to mod_proxy_fdpass.
...
Also move '#error' after the includes, because it seems
CMSG_DATA is commonly defined in sys/socket.h.
The check also overwrites _apmod_error_fatal in case
CMSG_DATA is not defined to allow building when configure
was called with "--enable-proxy". Otherwise one would need
to explicitly disable mod_proxy_fdpass.
We might want to remove the #error completely, because the
new feature test prevents the building of the module when
the symbol is not defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730803 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 18:15:02 +00:00
6da5f085da
add mod_proxy_scgi, as announced a long time ago
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@729538 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 21:41:48 +00:00
5eb866768d
Fix C90 forbids mixed declarations and code.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728547 13f79535-47bb-0310-9956-ffa450edef68
2008-12-21 22:58:56 +00:00
f2cf8d6e5d
Use apr_cpystrn instead of strncpy since strncpy can create an unterminated string.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@727777 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 17:51:18 +00:00
500d4a7c83
Remove safe duplication...
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726217 13f79535-47bb-0310-9956-ffa450edef68
2008-12-13 15:12:06 +00:00
8f1ff371d7
Treat proxy/balancers normally and independently...
...
also, allow nice pretty
Making all in proxy
...
Making all in proxy/balancers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@726068 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 16:31:15 +00:00
1e06b62d69
Add configuration of the Flush provider for mod_proxy_fdpass.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725946 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 08:46:47 +00:00
3161002dc7
Move the provider interface to a separate header file for mod_proxy_fdpass.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725943 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 08:33:31 +00:00
ad762da5ad
Convert the flushing mechanism used before passing the socket to be based on a provider, and include a default one using a flush.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725942 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 08:24:28 +00:00
38ca097dde
Add a new mod_proxy_fdpass module to pass a client connection off to a separate daemon.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725940 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 08:04:47 +00:00
0b645bf324
OK, instead of an igly hack, just use the normal
...
build system impl to force balancer's config to
happen post proxy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724367 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 14:51:50 +00:00
c27585f6e4
Explain some things
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724360 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 14:31:30 +00:00
826cb7f002
Force the lbmethod submodules to be loaded AFTER
...
mod_proxy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@724358 13f79535-47bb-0310-9956-ffa450edef68
2008-12-08 14:28:28 +00:00
54d13fef11
Make the max time from when we last saw a host a compile time option.
...
Suggested by: Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723685 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 09:29:52 +00:00
f47b6f394e
Import the core parts of the DTrace patch. This is a modified and updated
...
version of what was submited by Theo before:
<http://mail-archives.apache.org/mod_mbox/httpd-dev/200805.mbox/%3C6AFBCFE8-4CCA-4A02-8A43-F9170689695D@omniti.com%3E >
Note, this does not hook it up into the build system at this time, because
the original patch was a little too creative there.
Submitted By: Theo Schlossnagle <jesus omniti.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723565 13f79535-47bb-0310-9956-ffa450edef68
2008-12-05 03:34:52 +00:00
653ac709cc
All lbmethods are now ind submodules...
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722952 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 16:08:26 +00:00
c26d704939
Allow for ind lbs to build
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722951 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 16:07:50 +00:00
7945337ff0
Add in independent bytraffic lbmethod
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722950 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 16:07:11 +00:00
49c39903be
Add in independent byrequests lbmethod
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722949 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 16:06:43 +00:00
54ab9d06cb
Add in independent bybusyness lbmethod
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722948 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 16:06:13 +00:00
0ba3876a2d
And allow for the submod to be built
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722920 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 15:04:17 +00:00
933f257ec5
And move the HB balancer there
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722919 13f79535-47bb-0310-9956-ffa450edef68
2008-12-03 15:02:38 +00:00
736f9595cc
Add the new modules to the netware build
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@722156 13f79535-47bb-0310-9956-ffa450edef68
2008-12-01 18:12:46 +00:00
7af7af8f27
Add a new module to read in the heartbeat file and do load balancing for
...
mod_proxy based upon it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@721987 13f79535-47bb-0310-9956-ffa450edef68
2008-12-01 07:25:11 +00:00
4a3c945b14
* Rip out the old flushing approach for solving lifetime issues between the
...
backend connection bucket allocator and front end connection bucket allocator.
Instead copy the buckets from the backend over to ones that have been created
using the front end bucket allocator. For metabucket this is done by recreating
them, for data buckets this is done by reading them and putting the read data
in a transient bucket.
PR: 45792
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@712375 13f79535-47bb-0310-9956-ffa450edef68
2008-11-08 11:09:38 +00:00
6a9e00043c
Ummm why bother setting vars if we are bailing?
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@710218 13f79535-47bb-0310-9956-ffa450edef68
2008-11-03 23:19:54 +00:00
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
0c674a71e6
* save_table needs to be declared first before it can be used.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707665 13f79535-47bb-0310-9956-ffa450edef68
2008-10-24 16:00:10 +00:00
9b6fefa44f
AJP was dropping pre-existing cookies. Use same logic
...
as HTTP to tuck them away
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707649 13f79535-47bb-0310-9956-ffa450edef68
2008-10-24 15:01:44 +00:00
e1ed6484fd
Fix the io buffersize code. Have the docs match the code
...
and allow more flexibility in settings. Also, document
the ProxyPass/worker options of io and rec buffersize.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707357 13f79535-47bb-0310-9956-ffa450edef68
2008-10-23 12:01:53 +00:00
cd7a438a43
Remove potential for memory leak... allocate on this
...
request which is now viable due to connection pooling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707163 13f79535-47bb-0310-9956-ffa450edef68
2008-10-22 19:13:57 +00:00
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
81c73ca116
* Move ap_timeout_parameter_parse from mod_proxy.c to server/util.c and thus
...
make it part of the public API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707022 13f79535-47bb-0310-9956-ffa450edef68
2008-10-22 10:23:52 +00:00
c1f881e048
* Improve the way to detect whether buckets in the filter chain need to be
...
flushed by using the main requests bytes_count field instead of the
subrequest field.
* Do not reset conn->need_flush. This prevents SegFaults from not flushing
buckets in the filter chain.
PR: 45792
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@706921 13f79535-47bb-0310-9956-ffa450edef68
2008-10-22 09:34:21 +00:00
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
1c99da5d39
* Add the possibility to set the worker parameters connectiontimeout and ping
...
in milliseconds and the parameter acquire in seconds.
Add the new currently static function ap_timeout_parameter_parse that
should become a general utility function once its API is hammered out.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@705005 13f79535-47bb-0310-9956-ffa450edef68
2008-10-15 19:43:51 +00:00
53ddbf41b5
* Revert r703998.
...
The call to apr_socket_timeout_set before apr_socket_connect already sets the
socket to non-blocking mode because the timeout of the socket is -1 after creation. A further
call to apr_socket_timeout_set (after the connect call does not do this, because the old
and the new timeout are >=0). The further code expects the socket to be in non-blocking
mode, otherwise we have regressions with ssl. This can be notified by running t/ssl/proxy
on 2.2.x which runs much much slower with the patch applied. This does not happen
on trunk because the socket is set back to non blocking by the core output filter
(async write completion).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@704753 13f79535-47bb-0310-9956-ffa450edef68
2008-10-15 00:53:39 +00:00
4809b77936
* Make the connection timeout to backends work by temporarily setting the
...
socket to non blocking mode.
Submitted by: Matt Stevenson <mavricknzwork yahoo.com>
Reviewed by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@703998 13f79535-47bb-0310-9956-ffa450edef68
2008-10-13 10:06:28 +00:00
14bb7079df
For timeouts, behave as before and not drop.
...
From Adam Woodworth <mirkperl gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@697362 13f79535-47bb-0310-9956-ffa450edef68
2008-09-20 13:44:26 +00:00
4a268cc90a
Allow for the smax param to be 0, so that all connections
...
are available to be dropped, should they be idle long
enough.
PR 43371
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@697093 13f79535-47bb-0310-9956-ffa450edef68
2008-09-19 13:43:48 +00:00
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
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
45c5291a7f
Allow determination of whether to use ';' as
...
a sticky session path delim/sep (ala mod_jk) to
be runtime (and balancer-wise) configurable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@687754 13f79535-47bb-0310-9956-ffa450edef68
2008-08-21 13:33:32 +00:00
