From 7865005fa1a42803124ecf5f0538c3753bc7f91c Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 4 Apr 2012 04:10:58 +0000 Subject: * lib/ftp/ftp.rb (Net::FTP#close): restore original read_timeout. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/ftp.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'lib/net') diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 3dc1e2efb4..5be2981dd0 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -933,10 +933,14 @@ module Net # def close if @sock and not @sock.closed? - @sock.shutdown(Socket::SHUT_WR) rescue nil - @sock.read_timeout = 3 - @sock.read rescue nil - @sock.close + begin + @sock.shutdown(Socket::SHUT_WR) rescue nil + orig, self.read_timeout = self.read_timeout, 3 + @sock.read rescue nil + ensure + @sock.close + self.read_timeout = orig + end end end -- cgit v1.2.3