https://bz.apache.org/bugzilla/show_bug.cgi?id=65886
--- Comment #5 from Ruediger Pluem <rpl...@apache.org> ---
Something like the following patch:
Index: modules/proxy/mod_proxy_http.c
===================================================================
--- modules/proxy/mod_proxy_http.c (revision 1898054)
+++ modules/proxy/mod_proxy_http.c (working copy)
@@ -1485,10 +1485,10 @@
return HTTP_INTERNAL_SERVER_ERROR;
}
- /* Set timeout to the lowest configured for client or backend */
+ /* Set timeout to the highest configured for client or backend */
apr_socket_timeout_get(backend->sock, &backend_timeout);
apr_socket_timeout_get(ap_get_conn_socket(c), &client_timeout);
- if (backend_timeout >= 0 && backend_timeout < client_timeout) {
+ if (backend_timeout >= 0 && backend_timeout > client_timeout) {
tunnel->timeout = backend_timeout;
}
else {
Index: modules/proxy/proxy_util.c
===================================================================
--- modules/proxy/proxy_util.c (revision 1898054)
+++ modules/proxy/proxy_util.c (working copy)
@@ -4718,10 +4718,10 @@
tunnel->origin->pfd->desc.s = ap_get_conn_socket(c_o);
tunnel->origin->pfd->client_data = tunnel->origin;
- /* Defaults to the smallest timeout of both connections */
+ /* Defaults to the biggest timeout of both connections */
apr_socket_timeout_get(tunnel->client->pfd->desc.s, &timeout);
apr_socket_timeout_get(tunnel->origin->pfd->desc.s, &tunnel->timeout);
- if (timeout >= 0 && (tunnel->timeout < 0 || tunnel->timeout > timeout)) {
+ if (timeout >= 0 && (tunnel->timeout < 0 || tunnel->timeout < timeout)) {
tunnel->timeout = timeout;
}
--
You are receiving this mail because:
You are the assignee for the bug.
---------------------------------------------------------------------
To unsubscribe, e-mail: bugs-unsubscr...@httpd.apache.org
For additional commands, e-mail: bugs-h...@httpd.apache.org
