Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net/http.rb - fixup session timeout logic for OpenSSL 3 #165

Closed
wants to merge 2 commits into from
Closed

net/http.rb - fixup session timeout logic for OpenSSL 3 #165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1ead39
net/http.rb - fixup session timeout logic for OpenSSL 3
MSP-Greg Nov 27, 2023
b7a53a6
net/http.rb - add comment about ssl_timeout values
MSP-Greg Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/net/http.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ class HTTPHeaderSyntaxError < StandardError; end
# - {:ssl_timeout}[rdoc-ref:Net::HTTP#ssl_timeout]:
# Returns the ssl timeout.
# - {:ssl_timeout=}[rdoc-ref:Net::HTTP#ssl_timeout=]:
# Sets the ssl timeout.
# Sets the client ssl session timeout. A zero or negative value will disable client session reuse.
# - {:write_timeout}[rdoc-ref:Net::HTTP#write_timeout]:
# Returns the write timeout.
# - {write_timeout=}[rdoc-ref:Net::HTTP#write_timeout=]:
Expand Down Expand Up @@ -1668,7 +1668,9 @@ def connect
s.hostname = ssl_host_address if s.respond_to?(:hostname=) && ssl_host_address

if @ssl_session and
Process.clock_gettime(Process::CLOCK_REALTIME) < @ssl_session.time.to_f + @ssl_session.timeout
# @ssl_session.timeout is not reliable due to signed/unsigned issues with OpenSSL 3,
# use only if s.context.timeout is nil
Process.clock_gettime(Process::CLOCK_REALTIME) < @ssl_session.time.to_f + (s.context.timeout || @ssl_session.timeout)
s.session = @ssl_session
end
ssl_socket_connect(s, @open_timeout)
Expand Down