You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2008/02/14 13:55:58 UTC
svn commit: r627728 - in /httpd/httpd/trunk: CHANGES
docs/manual/mod/mod_proxy.xml modules/proxy/mod_proxy.c
modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
Author: jim
Date: Thu Feb 14 04:55:57 2008
New Revision: 627728
URL: http://svn.apache.org/viewvc?rev=627728&view=rev
Log:
Add in mod_jk's disablereuse analog for mod_proxy.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
httpd/httpd/trunk/modules/proxy/mod_proxy.c
httpd/httpd/trunk/modules/proxy/mod_proxy.h
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=627728&r1=627727&r2=627728&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Feb 14 04:55:57 2008
@@ -2,6 +2,10 @@
Changes with Apache 2.3.0
[ When backported to 2.2.x, remove entry from this file ]
+ *) Added 'disablereuse' option for ProxyPass which, essentially,
+ disables connection pooling for the backend servers.
+ [Jim Jagielski]
+
*) Activate mod_cache, mod_file_cache and mod_disc_cache as part of the
'most' set for '--enable-modules' and '--enable-shared-mods'. Include
mod_mem_cache in 'all' as well. [Dirk-Willem van Gulik]
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml?rev=627728&r1=627727&r2=627728&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml Thu Feb 14 04:55:57 2008
@@ -693,6 +693,16 @@
in the pool the Apache will return <code>SERVER_BUSY</code> status to
the client.
</td></tr>
+ <tr><td>disablereuse</td>
+ <td>Off</td>
+ <td>This parameter should be used when you want to force mod_proxy
+ to immediately close a connection to the backend after being used, and
+ thus, disable its persistant connection and pool for that backend.
+ This helps in various situations where a firewall between Apache and
+ the backend server (irregardless of protocol) tends to silently
+ drop connections. To prevent mod_proxy from reusing the backend connection,
+ set this property value to <code>On</code>.
+ </td></tr>
<tr><td>flushpackets</td>
<td>off</td>
<td>Determines whether the proxy module will auto-flush the output
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=627728&r1=627727&r2=627728&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Thu Feb 14 04:55:57 2008
@@ -176,6 +176,15 @@
return "KeepAlive must be On|Off";
worker->keepalive_set = 1;
}
+ else if (!strcasecmp(key, "disablereuse")) {
+ if (!strcasecmp(val, "on"))
+ worker->disablereuse = 1;
+ else if (!strcasecmp(val, "off"))
+ worker->disablereuse = 0;
+ else
+ return "DisableReuse must be On|Off";
+ worker->disablereuse_set = 1;
+ }
else if (!strcasecmp(key, "route")) {
/* Worker route.
*/
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=627728&r1=627727&r2=627728&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Thu Feb 14 04:55:57 2008
@@ -352,6 +352,8 @@
char ping_timeout_set;
int lbset; /* load balancer cluster set */
char retry_set;
+ char disablereuse;
+ char disablereuse_set;
};
/*
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=627728&r1=627727&r2=627728&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Thu Feb 14 04:55:57 2008
@@ -1698,7 +1698,7 @@
}
/* determine if the connection need to be closed */
- if (conn->close || !worker->is_address_reusable) {
+ if (conn->close || !worker->is_address_reusable || worker->disablereuse) {
apr_pool_t *p = conn->pool;
apr_pool_clear(p);
conn = apr_pcalloc(p, sizeof(proxy_conn_rec));
@@ -1902,8 +1902,13 @@
if (!worker->retry_set) {
worker->retry = apr_time_from_sec(PROXY_WORKER_DEFAULT_RETRY);
}
- /* By default address is reusable */
- worker->is_address_reusable = 1;
+ /* By default address is reusable unless DisableReuse is set */
+ if (worker->disablereuse) {
+ worker->is_address_reusable = 0;
+ }
+ else {
+ worker->is_address_reusable = 1;
+ }
#if APR_HAS_THREADS
ap_mpm_query(AP_MPMQ_MAX_THREADS, &mpm_threads);
@@ -2114,7 +2119,8 @@
*
* TODO: Handle this much better...
*/
- if (!conn->hostname || !worker->is_address_reusable ||
+ if (!conn->hostname || !worker->is_address_reusable ||
+ worker->disablereuse ||
(r->connection->keepalives &&
(r->proxyreq == PROXYREQ_PROXY || r->proxyreq == PROXYREQ_REVERSE) &&
(strcasecmp(conn->hostname, uri->hostname) != 0) ) ) {
Re: svn commit: r627728 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_proxy.xml
modules/proxy/mod_proxy.c modules/proxy/mod_proxy.h modules/proxy/proxy_util.c
Posted by Ruediger Pluem <rp...@apache.org>.
On 02/14/2008 01:55 PM, jim@apache.org wrote:
> Author: jim
> Date: Thu Feb 14 04:55:57 2008
> New Revision: 627728
>
> URL: http://svn.apache.org/viewvc?rev=627728&view=rev
> Log:
> Add in mod_jk's disablereuse analog for mod_proxy.
>
> Modified:
> httpd/httpd/trunk/CHANGES
> httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml
> httpd/httpd/trunk/modules/proxy/mod_proxy.c
> httpd/httpd/trunk/modules/proxy/mod_proxy.h
> httpd/httpd/trunk/modules/proxy/proxy_util.c
>
> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=627728&r1=627727&r2=627728&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Thu Feb 14 04:55:57 2008
> @@ -352,6 +352,8 @@
> char ping_timeout_set;
> int lbset; /* load balancer cluster set */
> char retry_set;
> + char disablereuse;
> + char disablereuse_set;
> };
I am missing a minor bump due to these changes.
>
> /*
>
> Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=627728&r1=627727&r2=627728&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
> +++ httpd/httpd/trunk/modules/proxy/proxy_util.c Thu Feb 14 04:55:57 2008
> @@ -1698,7 +1698,7 @@
> }
>
> /* determine if the connection need to be closed */
> - if (conn->close || !worker->is_address_reusable) {
> + if (conn->close || !worker->is_address_reusable || worker->disablereuse) {
> apr_pool_t *p = conn->pool;
> apr_pool_clear(p);
> conn = apr_pcalloc(p, sizeof(proxy_conn_rec));
> @@ -1902,8 +1902,13 @@
> if (!worker->retry_set) {
> worker->retry = apr_time_from_sec(PROXY_WORKER_DEFAULT_RETRY);
> }
> - /* By default address is reusable */
> - worker->is_address_reusable = 1;
> + /* By default address is reusable unless DisableReuse is set */
> + if (worker->disablereuse) {
> + worker->is_address_reusable = 0;
Is this really a good idea? Why repeat the DNS resolution only because
we want to avoid persistent connections?
Regards
RĂ¼diger