Skip to content

Commit 463e261

Browse files
committed
backwards compatible to very old ruby
1 parent 7a3f41b commit 463e261

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

lib/net/smtp.rb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,12 @@ def finish
660660

661661
private
662662

663-
def tcp_socket(*args, **kwargs)
664-
TCPSocket.open(*args, **kwargs)
663+
def tcp_socket(address, port, open_timeout: nil)
664+
if open_timeout
665+
TCPSocket.open(address, port, nil, nil, open_timeout: open_timeout)
666+
else
667+
TCPSocket.open(address, port)
668+
end
665669
end
666670

667671
def do_start(helo_domain, user, secret, authtype)
@@ -674,7 +678,7 @@ def do_start(helo_domain, user, secret, authtype)
674678
case @tcp_socket_supports_open_timeout
675679
when nil, true
676680
begin
677-
sock = tcp_socket(@address, @port, nil, nil, open_timeout: @open_timeout)
681+
sock = tcp_socket(@address, @port, open_timeout: @open_timeout)
678682
@tcp_socket_supports_open_timeout = true
679683
sock
680684
rescue ArgumentError => e

test/net/smtp/test_sslcontext.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def initialize(socket, **kw)
2121
super("localhost", **kw)
2222
end
2323

24-
def tcp_socket(*args, **kwargs)
24+
def tcp_socket(*)
2525
@fake_socket
2626
end
2727

test/net/smtp/test_starttls.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def initialize(socket)
1414
super("smtp.example.com")
1515
end
1616

17-
def tcp_socket(*args, **kwargs)
17+
def tcp_socket(*)
1818
@fake_socket
1919
end
2020

0 commit comments

Comments
 (0)