From fd82a02ec8c84a6f2bca3ddf3002f60017708ba3 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Wed, 11 Aug 2004 22:16:27 +0000 Subject: [PATCH] Add worker timeout inherited from ProxyTimeout. Submitted by: mturk git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104588 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/mod_proxy.c | 4 ++++ modules/proxy/mod_proxy.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 07ccebc57c..73fce3c1b6 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -876,6 +876,8 @@ static const char * 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 @@ static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg) 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; diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index e1a050b438..2328efdee0 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -225,6 +225,8 @@ typedef struct { 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; -- 2.50.1