diff options
| author | nagachika <nagachika@ruby-lang.org> | 2020-07-25 21:42:20 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2020-07-25 21:42:20 +0900 |
| commit | 578bacc471fa3fa14f8607fe67adccce21e81657 (patch) | |
| tree | d491552c0396cc7511d9eb16c90d3e05a46de16e /lib | |
| parent | 12391cdbe11f3fbeb3b04c30b944139e5bbd9ea6 (diff) | |
merge revision(s) 5e81e8675a020ecd493620a4ff38db8fcf4b972a: [Backport #16780]
Ignore exceptions when closing data connections [Bug #16780]
Patch by koshigoe (Masataka SUZUKI). Thanks!
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/net/ftp.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index d1e545c0c8..610027dc38 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -634,9 +634,9 @@ module Net while data = conn.read(blocksize) yield(data) end - conn.shutdown(Socket::SHUT_WR) + conn.shutdown(Socket::SHUT_WR) rescue nil conn.read_timeout = 1 - conn.read + conn.read rescue nil ensure conn.close if conn end @@ -659,9 +659,9 @@ module Net while line = conn.gets yield(line.sub(/\r?\n\z/, ""), !line.match(/\n\z/).nil?) end - conn.shutdown(Socket::SHUT_WR) + conn.shutdown(Socket::SHUT_WR) rescue nil conn.read_timeout = 1 - conn.read + conn.read rescue nil ensure conn.close if conn end @@ -688,9 +688,9 @@ module Net conn.write(buf) yield(buf) if block_given? end - conn.shutdown(Socket::SHUT_WR) + conn.shutdown(Socket::SHUT_WR) rescue nil conn.read_timeout = 1 - conn.read + conn.read rescue nil ensure conn.close if conn end @@ -724,9 +724,9 @@ module Net conn.write(buf) yield(buf) if block_given? end - conn.shutdown(Socket::SHUT_WR) + conn.shutdown(Socket::SHUT_WR) rescue nil conn.read_timeout = 1 - conn.read + conn.read rescue nil ensure conn.close if conn end |