mturk 2004/08/05 09:27:07
Modified: ajp/proxy mod_proxy.c
Log:
Use timeout_set for worker inherited from ProxyTimeout but overridable
using timout=xxx
Revision Changes Path
1.26 +9 -2 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mod_proxy.c 5 Aug 2004 14:41:10 -0000 1.25
+++ mod_proxy.c 5 Aug 2004 16:27:06 -0000 1.26
@@ -121,6 +121,13 @@
worker->acquire = apr_time_make(0, ival * 1000);
worker->acquire_set = 1;
}
+ else if (!strcasecmp(key, "timeout")) {
+ ival = atoi(val);
+ if (ival < 1)
+ return "timeout must be at least one second";
+ worker->timeout = apr_time_from_sec(ival);
+ worker->timeout_set = 1;
+ }
else {
return "unknown parameter";
}
@@ -1231,9 +1238,9 @@
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)
+ if ((worker->timeout_set = conf->timeout_set))
worker->timeout = conf->timeout;
-
+
arr = apr_table_elts(params);
elts = (const apr_table_entry_t *)arr->elts;
for (i = 0; i < arr->nelts; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
