зеркало из https://github.com/github/ruby.git
* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move nonblock
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:
Родитель
b830786f2d
Коммит
175862843c
|
@ -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>
|
||||
|
||||
* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move
|
||||
|
|
|
@ -166,13 +166,6 @@ module OpenSSL
|
|||
end
|
||||
end
|
||||
|
||||
module Nonblock
|
||||
def initialize(*args)
|
||||
@io.nonblock = true if @io.respond_to?(:nonblock=)
|
||||
super
|
||||
end
|
||||
end
|
||||
|
||||
def verify_certificate_identity(cert, hostname)
|
||||
should_verify_common_name = true
|
||||
cert.extensions.each{|ext|
|
||||
|
@ -260,7 +253,6 @@ module OpenSSL
|
|||
class SSLSocket
|
||||
include Buffering
|
||||
include SocketForwarder
|
||||
include Nonblock
|
||||
|
||||
if ExtConfig::OPENSSL_NO_SOCK
|
||||
def initialize(io, ctx = nil); raise NotImplmentedError; end
|
||||
|
@ -293,6 +285,7 @@ module OpenSSL
|
|||
@context = context
|
||||
@sync_close = false
|
||||
@hostname = nil
|
||||
@io.nonblock = true if @io.respond_to?(:nonblock=)
|
||||
context.setup
|
||||
super()
|
||||
end
|
||||
|
|
Загрузка…
Ссылка в новой задаче