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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 07ccebc57c81e894698c5c1edfae2759a4fa7fa3..73fce3c1b635d0cb498c66edaa1343e4319a6920 100644 (file)
--- 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 e1a050b438eb52c6a18a8aa4e9d8f2c8a13eebeb..2328efdee02d5eedc644ed904ad01d8e5e6b360c 100644 (file)
--- 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;