Skip to content

Commit

Permalink
introduce so_timeout option and honor send_timeout as well
Browse files Browse the repository at this point in the history
  • Loading branch information
Hiroshi Nakamura committed Dec 9, 2016
1 parent 382458e commit b49389c
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lib/httpclient/jruby_ssl_socket.rb
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,9 @@ def self.create_socket(session)
end
end
opts = {
:connect_timeout => session.connect_timeout,
:receive_timeout => session.receive_timeout,
:send_timeout => session.send_timeout,
:connect_timeout => session.connect_timeout * 1000,
# send_timeout is ignored in JRuby
:so_timeout => session.receive_timeout * 1000,
:tcp_keepalive => session.tcp_keepalive
}
new(socket, session.dest, session.ssl_config, session.debug_dev, opts)
Expand Down Expand Up @@ -547,12 +547,12 @@ def create_ssl_socket(socket, dest, config, opts)
ssl_socket = factory.createSocket
socket_addr = InetSocketAddress.new(dest.host, dest.port)
if opts[:connect_timeout]
ssl_socket.connect(socket_addr, opts[:connect_timeout] * 1000)
ssl_socket.connect(socket_addr, opts[:connect_timeout])
else
ssl_socket.connect(socket_addr)
end
end
ssl_socket.setSoTimeout(opts[:receive_timeout] * 1000) if opts[:receive_timeout]
ssl_socket.setSoTimeout(opts[:so_timeout]) if opts[:so_timeout]
ssl_socket.setKeepAlive(true) if opts[:tcp_keepalive]
ssl_socket
end
Expand Down

0 comments on commit b49389c

Please sign in to comment.