summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-04 01:09:09 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-04 01:09:09 +0000
commit14cbd61f0104a37c67a1191b99c1a37dddfe7232 (patch)
treebee8281605198807f5edd22cd843917442607c3f /ext
parent9e73d45e0f38fddc7a117c5bc2eab103573e5986 (diff)
ext/openssl/lib/openssl/ssl.rb: use io/nonblock instead of fcntl
[ruby-core:69382] [Feature #11190] IO#nonblock= is easier-to-read, potentially more portable, and avoids redundantly setting flags. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50762 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/openssl/lib/openssl/ssl.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 0cab141e24..cc956fa6b5 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -15,7 +15,7 @@
=end
require "openssl/buffering"
-require "fcntl"
+require "io/nonblock"
module OpenSSL
module SSL
@@ -126,9 +126,7 @@ module OpenSSL
module Nonblock
def initialize(*args)
- flag = File::NONBLOCK
- flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
- @io.fcntl(Fcntl::F_SETFL, flag)
+ @io.nonblock = true if @io.respond_to?(:nonblock=)
super
end
end