1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move nonblock

Browse Source 
enable to SSLSocket#initialize and remove Nonblock module.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2015-08-05 22:59:00 +00:00
parent b830786f2d
commit 175862843c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Aug 6 07:57:21 2015 Aaron Patterson <tenderlove@ruby-lang.org>
* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move nonblock
enable to SSLSocket#initialize and remove Nonblock module.
Thu Aug 6 07:53:47 2015 Aaron Patterson <tenderlove@ruby-lang.org> Thu Aug 6 07:53:47 2015 Aaron Patterson <tenderlove@ruby-lang.org>
* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move * ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move

9
ext/openssl/lib/openssl/ssl.rb
View File

@ -166,13 +166,6 @@ module OpenSSL
end end
end end
module Nonblock
def initialize(*args)
@io.nonblock = true if @io.respond_to?(:nonblock=)
super
end
end
def verify_certificate_identity(cert, hostname) def verify_certificate_identity(cert, hostname)
should_verify_common_name = true should_verify_common_name = true
cert.extensions.each{|ext| cert.extensions.each{|ext|
@ -260,7 +253,6 @@ module OpenSSL
class SSLSocket class SSLSocket
include Buffering include Buffering
include SocketForwarder include SocketForwarder
include Nonblock
if ExtConfig::OPENSSL_NO_SOCK if ExtConfig::OPENSSL_NO_SOCK
def initialize(io, ctx = nil); raise NotImplmentedError; end def initialize(io, ctx = nil); raise NotImplmentedError; end
@ -293,6 +285,7 @@ module OpenSSL
@context = context @context = context
@sync_close = false @sync_close = false
@hostname = nil @hostname = nil
@io.nonblock = true if @io.respond_to?(:nonblock=)
context.setup context.setup
super() super()
end end