From: Jan Kaluža <jkaluza@apache.org>
Date: Wed, 18 Sep 2013 11:18:02 +0000 (+0000)
Subject: Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d47aaf73f7378c74a8c065bec5f58f293293cf8;p=thirdparty%2Fapache%2Fhttpd.git

Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1524368 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_fcgi.c b/modules/proxy/mod_proxy_fcgi.c
index b27d78c638b..75d7ef53a19 100644
--- a/modules/proxy/mod_proxy_fcgi.c
+++ b/modules/proxy/mod_proxy_fcgi.c
@@ -429,15 +429,13 @@ static apr_status_t dispatch(proxy_conn_rec *conn, proxy_dir_conf *conf,
     ob = apr_brigade_create(r->pool, c->bucket_alloc);
 
     while (! done) {
-        apr_interval_time_t timeout = conn->worker->s->timeout;
+        apr_interval_time_t timeout;
         apr_size_t len;
         int n;
 
         /* We need SOME kind of timeout here, or virtually anything will
          * cause timeout errors. */
-        if (! conn->worker->s->timeout_set) {
-            timeout = apr_time_from_sec(30);
-        }
+        apr_socket_timeout_get(conn->sock, &timeout);
 
         rv = apr_poll(&pfd, 1, &n, timeout);
         if (rv != APR_SUCCESS) {