kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

shutdown(2) should not be called for SSLSocket.

Browse source 
SSLSocket#stop is a private method and cannot be called, but explicit calls
are not necessary because SSL_shutdown() is called from SSLSocket#close.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2016-11-20 01:44:07 +00:00
parent 279deb6051
commit f0dd33d549
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/net/ftp.rb
View file

@ -1406,11 +1406,13 @@ module Net
end
def shutdown(*args)
if @io.respond_to?(:stop)
# shut down the TLS connection gracefully.
@io.stop
if defined?(OpenSSL::SSL::SSLSocket) &&
@io.is_a?(OpenSSL::SSL::SSLSocket)
# If @io is an SSLSocket, SSL_shutdown() will be called from
# SSLSocket#close, so shutdown(2) should not be called.
else
@io.shutdown(*args)
end
@io.to_io.shutdown(*args)
end
def read(len = nil)