[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    svn commit: r1910704 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
From:       icing () apache ! org
Date:       2023-06-30 9:08:24
Message-ID: 20230630090824.188DD17B3CE () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: icing
Date: Fri Jun 30 09:08:23 2023
New Revision: 1910704

URL: http://svn.apache.org/viewvc?rev=1910704&view=rev
Log:
proxy: in proxy tunnels, use the smaller timeout value of
       client and origin as timeout for polling the tunnel.


Modified:
    httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1910704&r1=1910703&r2=1910704&view=diff
 ==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Fri Jun 30 09:08:23 2023
@@ -4921,9 +4921,9 @@ PROXY_DECLARE(apr_status_t) ap_proxy_tun
     apr_socket_timeout_get(tunnel->origin->pfd->desc.s, &origin_timeout);
     apr_socket_opt_set(tunnel->origin->pfd->desc.s, APR_SO_NONBLOCK, 1);
 
-    /* Defaults to the biggest timeout of both connections */
-    tunnel->timeout = (origin_timeout >= 0 && origin_timeout > client_timeout)?
-                      origin_timeout : client_timeout;
+    /* Defaults to the smallest timeout of both connections */
+    tunnel->timeout = (client_timeout >= 0 && client_timeout < origin_timeout ?
+                       client_timeout : origin_timeout);
 
     /* Bidirectional non-HTTP stream will confuse mod_reqtimeoout */
     ap_remove_input_filter_byhandle(c_i->input_filters, "reqtimeout");


[prev in list] [next in list] [prev in thread] [next in thread]