From 273f7caa2b3de92d05a6bcaa54cd84dc9a871320 Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Wed, 11 Nov 2026 18:45:00 +0900 Subject: [PATCH] Use IO#close_write instead of #shutdown Prefer IO#close_write for simplicity. OpenSSL::SSL::SSLSocket also provides it in ruby/openssl >= 3.3 (default gem in Ruby >= 3.4). This avoids using the private OpenSSL::SSL::SSLSocket#stop method when #close_write is available. --- lib/net/ftp.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index 261dd65..1f203e5 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -609,7 +609,7 @@ def transfercmd(cmd, rest_offset = nil) # :nodoc: raise FTPReplyError, resp end conn, = sock.accept - sock.shutdown(Socket::SHUT_WR) rescue nil + sock.close_write rescue nil sock.read rescue nil ensure sock.close @@ -671,7 +671,7 @@ def retrbinary(cmd, blocksize, rest_offset = nil) # :yield: data while data = conn.read(blocksize) yield(data) end - conn.shutdown(Socket::SHUT_WR) rescue nil + conn.close_write rescue nil conn.read_timeout = 1 conn.read rescue nil ensure @@ -696,7 +696,7 @@ def retrlines(cmd) # :yield: line while line = conn.gets yield(line.sub(/\r?\n\z/, ""), !line.match(/\n\z/).nil?) end - conn.shutdown(Socket::SHUT_WR) rescue nil + conn.close_write rescue nil conn.read_timeout = 1 conn.read rescue nil ensure @@ -725,7 +725,7 @@ def storbinary(cmd, file, blocksize, rest_offset = nil) # :yield: data conn.write(buf) yield(buf) if block_given? end - conn.shutdown(Socket::SHUT_WR) rescue nil + conn.close_write rescue nil conn.read_timeout = 1 conn.read rescue nil ensure @@ -761,7 +761,7 @@ def storlines(cmd, file) # :yield: line conn.write(buf) yield(buf) if block_given? end - conn.shutdown(Socket::SHUT_WR) rescue nil + conn.close_write rescue nil conn.read_timeout = 1 conn.read rescue nil ensure @@ -1397,7 +1397,7 @@ def option(name, params = nil) def close if @sock and not @sock.closed? begin - @sock.shutdown(Socket::SHUT_WR) rescue nil + @sock.close_write rescue nil orig, self.read_timeout = self.read_timeout, 3 @sock.read rescue nil ensure @@ -1507,7 +1507,7 @@ def method_missing(mid, *args) end class BufferedSocket < BufferedIO - [:local_address, :remote_address, :addr, :peeraddr, :send, :shutdown].each do |method| + [:local_address, :remote_address, :addr, :peeraddr, :send, :close_write].each do |method| define_method(method) { |*args| @io.__send__(method, *args) } @@ -1544,10 +1544,10 @@ def readline if defined?(OpenSSL::SSL::SSLSocket) class BufferedSSLSocket < BufferedSocket - def shutdown(*args) + def close_write # Invokes SSL_shutdown, which sends a close_notify message to the peer. @io.__send__(:stop) - end + end if OpenSSL::VERSION < "3.3" # openssl 3.3 = Ruby 3.4 def send(mesg, flags, dest = nil) # Ignore flags and dest.