From 5f03f753eefcff619b8792c52a4a6735bd626282 Mon Sep 17 00:00:00 2001 From: shugo Date: Sat, 19 Nov 2016 04:19:35 +0000 Subject: [PATCH] Shut down TLS connections gracefully. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/ftp.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 60a59511ff..0ecd9a7e4f 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -1281,7 +1281,7 @@ module Net def close if @sock and not @sock.closed? begin - @bare_sock.shutdown(Socket::SHUT_WR) rescue nil + @sock.shutdown(Socket::SHUT_WR) rescue nil orig, self.read_timeout = self.read_timeout, 3 @sock.read rescue nil ensure @@ -1404,6 +1404,10 @@ module Net end def shutdown(*args) + if @io.respond_to?(:stop) + # shut down the TLS connection gracefully. + @io.stop + end @io.to_io.shutdown(*args) end