From bd481204b539348858d30bca845882d9d07f518c Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 29 Jan 2025 09:42:20 +0100 Subject: [PATCH] Fix missing timeout options in `Request` class (#33769) --- app/lib/request.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/lib/request.rb b/app/lib/request.rb index 4e86cc2fdf..4e0ba77833 100644 --- a/app/lib/request.rb +++ b/app/lib/request.rb @@ -81,8 +81,11 @@ class Request max_hops: 3, on_redirect: ->(response, request) { re_sign_on_redirect(response, request) }, }, + }.merge(options).merge( socket_class: use_proxy? || @allow_local ? ProxySocket : Socket, - }.merge(options) + timeout_class: PerOperationWithDeadline, + timeout_options: TIMEOUT + ) @options = @options.merge(proxy_url) if use_proxy? @headers = {}