altarch-user / rpms / httpd

Forked from rpms/httpd 2 years ago
Clone

Blame SOURCES/httpd-2.4.6-r1524368.patch

0943f8
--- a/modules/proxy/mod_proxy_fcgi.c	2013/09/18 11:17:28	1524367
0943f8
+++ b/modules/proxy/mod_proxy_fcgi.c	2013/09/18 11:18:02	1524368
0943f8
@@ -429,15 +429,13 @@
0943f8
     ob = apr_brigade_create(r->pool, c->bucket_alloc);
0943f8
 
0943f8
     while (! done) {
0943f8
-        apr_interval_time_t timeout = conn->worker->s->timeout;
0943f8
+        apr_interval_time_t timeout;
0943f8
         apr_size_t len;
0943f8
         int n;
0943f8
 
0943f8
         /* We need SOME kind of timeout here, or virtually anything will
0943f8
          * cause timeout errors. */
0943f8
-        if (! conn->worker->s->timeout_set) {
0943f8
-            timeout = apr_time_from_sec(30);
0943f8
-        }
0943f8
+        apr_socket_timeout_get(conn->sock, &timeout);
0943f8
 
0943f8
         rv = apr_poll(&pfd, 1, &n, timeout);
0943f8
         if (rv != APR_SUCCESS) {