diff options
Diffstat (limited to 'lib/net/smtp.rb')
-rw-r--r-- | lib/net/smtp.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/net/smtp.rb b/lib/net/smtp.rb index ff205b4e28..86b55d278b 100644 --- a/lib/net/smtp.rb +++ b/lib/net/smtp.rb @@ -545,10 +545,8 @@ module Net check_auth_method(authtype || DEFAULT_AUTH_TYPE) check_auth_args user, secret end - begin - s = Socket.tcp(@address, @port, connect_timeout: @open_timeout) - rescue Errno::ETIMEDOUT - raise Net::OpenTimeout, "execution expired" + s = Timeout.timeout(@open_timeout, Net::OpenTimeout) do + tcp_socket(@address, @port) end logging "Connection opened: #{@address}:#{@port}" @socket = new_internet_message_io(tls? ? tlsconnect(s) : s) |