diff options
| author | Ruediger Pluem <rpluem@apache.org> | 2022-05-20 17:15:24 +0200 |
|---|---|---|
| committer | Ruediger Pluem <rpluem@apache.org> | 2022-05-20 17:15:24 +0200 |
| commit | a2f2188e1742ba65ca8bc6877a69b80da65a4435 (patch) | |
| tree | e414cbc3d1846aaf0f5d5d8d9066743fb305ebcd /modules/proxy | |
| parent | escaping doesn't actually happen by default (diff) | |
| download | apache2-a2f2188e1742ba65ca8bc6877a69b80da65a4435.tar.xz apache2-a2f2188e1742ba65ca8bc6877a69b80da65a4435.zip | |
* Port r546128 to mod_proxy_connect to ensure that core_pre_connection does not
succeed in resetting the timeout of our socket to base_server->timeout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1901088 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy')
| -rw-r--r-- | modules/proxy/mod_proxy_connect.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c index 12b72a54c9..c46a67f13c 100644 --- a/modules/proxy/mod_proxy_connect.c +++ b/modules/proxy/mod_proxy_connect.c @@ -170,6 +170,8 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, apr_port_t connectport = 0; apr_sockaddr_t *nexthop; + apr_interval_time_t current_timeout; + /* is this for us? */ if (r->method_number != M_CONNECT) { ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "declining URL %s", url); @@ -272,6 +274,13 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, return HTTP_INTERNAL_SERVER_ERROR; } ap_proxy_ssl_engine(backconn, r->per_dir_config, 0); + + /* + * save the timeout of the socket because core_pre_connection + * will set it to base_server->timeout + * (core TimeOut directive). + */ + apr_socket_timeout_get(sock, ¤t_timeout); rc = ap_run_pre_connection(backconn, sock); if (rc != OK && rc != DONE) { backconn->aborted = 1; @@ -280,6 +289,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, apr_socket_close(sock); return HTTP_INTERNAL_SERVER_ERROR; } + apr_socket_timeout_set(sock, current_timeout); ap_log_rerror(APLOG_MARK, APLOG_TRACE3, 0, r, "connection complete to %pI (%s)", |