mturk 2004/08/04 11:39:27
Modified: ajp/proxy mod_proxy.c mod_proxy.h
Log:
Add worker timeout inherited from ProxyTimeout.
Revision Changes Path
1.22 +4 -0 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_proxy.c 4 Aug 2004 16:07:03 -0000 1.21
+++ mod_proxy.c 4 Aug 2004 18:39:26 -0000 1.22
@@ -876,6 +876,8 @@
if (err)
return apr_pstrcat(cmd->temp_pool, "ProxyPass: ", err, NULL);
}
+ if (conf->timeout_set)
+ worker->timeout = conf->timeout;
for (i = 0; i < arr->nelts; i++) {
const char *err = set_worker_param(worker, elts[i].key, elts[i].val);
if (err)
@@ -1246,6 +1248,8 @@
if ((err = ap_proxy_add_worker(&worker, cmd->pool, conf, name)) != NULL)
return apr_pstrcat(cmd->temp_pool, "BalancerMember: ", err, NULL);
}
+ if (conf->timeout_set)
+ worker->timeout = conf->timeout;
arr = apr_table_elts(params);
elts = (const apr_table_entry_t *)arr->elts;
1.14 +2 -0 jakarta-tomcat-connectors/ajp/proxy/mod_proxy.h
Index: mod_proxy.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/proxy/mod_proxy.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_proxy.h 4 Aug 2004 15:12:13 -0000 1.13
+++ mod_proxy.h 4 Aug 2004 18:39:26 -0000 1.14
@@ -225,6 +225,8 @@
int hmax; /* Hard maximum on the total number of connections
*/
apr_interval_time_t ttl; /* maximum amount of time in seconds a connection
* may be available while exceeding the soft limit
*/
+ apr_interval_time_t timeout; /* connection timeout */
+
proxy_conn_pool *cp; /* Connection pool to use */
void *opaque; /* per scheme worker data */
} proxy_worker;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
