You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jk...@apache.org on 2013/09/18 13:18:02 UTC
svn commit: r1524368 - /httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
Author: jkaluza
Date: Wed Sep 18 11:18:02 2013
New Revision: 1524368
URL: http://svn.apache.org/r1524368
Log:
Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c?rev=1524368&r1=1524367&r2=1524368&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c Wed Sep 18 11:18:02 2013
@@ -429,15 +429,13 @@ static apr_status_t dispatch(proxy_conn_
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) {
Re: svn commit: r1524368 - /httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
Posted by Jan Kaluža <jk...@redhat.com>.
On 09/18/2013 02:12 PM, Eric Covener wrote:
> On Wed, Sep 18, 2013 at 7:18 AM, <jk...@apache.org> wrote:
>> Author: jkaluza
>> Date: Wed Sep 18 11:18:02 2013
>> New Revision: 1524368
>>
>> URL: http://svn.apache.org/r1524368
>> Log:
>> Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.
>
> Nice to have a CHANGES entry on this one (more useful when it's
> backported, but we usually use the same criteria for trunk).
>
Thanks for letting me now. I have done that in r1524388. Next time I
will do that in single commit...
Regards,
Jan Kaluza
Re: svn commit: r1524368 - /httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c
Posted by Eric Covener <co...@gmail.com>.
On Wed, Sep 18, 2013 at 7:18 AM, <jk...@apache.org> wrote:
> Author: jkaluza
> Date: Wed Sep 18 11:18:02 2013
> New Revision: 1524368
>
> URL: http://svn.apache.org/r1524368
> Log:
> Use apr_socket_timeout_get instead of hard-coded 30 seconds timeout.
Nice to have a CHANGES entry on this one (more useful when it's
backported, but we usually use the same criteria for trunk).