aboutsummaryrefslogtreecommitdiffstats
path: root/ext/openssl
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-05 22:59:00 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-05 22:59:00 +0000
commit28e967d5ef285c0ad6495e68cc5203cf4a8d5297 (patch)
tree2cc4ac7cc07a59e4ebea4036de0bf9b4e46a52d9 /ext/openssl
parentdd9ebf9b3d59abe0983f2a9b0f89f4b82737490e (diff)
downloadruby-28e967d5ef285c0ad6495e68cc5203cf4a8d5297.tar.gz
* 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
Diffstat (limited to 'ext/openssl')
-rw-r--r--ext/openssl/lib/openssl/ssl.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 8fba3ee369..1e398fc468 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -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