summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-21 03:44:10 +0000
committerrhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-05-21 03:44:10 +0000
commit9239916f5c8884cb9ade150160b48d360fddf49a (patch)
tree53659cbe2fb2d63ac29c54451f66289035f43f75
parent4458026d859fefb7705a88cb515e2a5f5e826705 (diff)
openssl: remove impossible EOFError raise in OpenSSL::Buffering
* ext/openssl/lib/openssl/buffering.rb (read_nonblock, readpartial): Remove impossible EOFError raise. Patch by Zach Anker <zanker@squareup.com>. [GH ruby/openssl#23] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/openssl/lib/openssl/buffering.rb2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b5a1058a3..3f933aad90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat May 21 12:40:36 2016 Kazuki Yamaguchi <k@rhe.jp>
+
+ * ext/openssl/lib/openssl/buffering.rb (read_nonblock, readpartial):
+ Remove impossible EOFError raise. Patch by Zach Anker
+ <zanker@squareup.com>. [GH ruby/openssl#23]
+
Sat May 21 11:18:42 2016 Evgeni Golov <evgeni@golov.de>
* lib/ipaddr.rb: [DOC] fix documentation of IN6MASK to mention
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index d082199000..61e1f43e00 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -132,7 +132,6 @@ module OpenSSL::Buffering
buf.replace(ret)
ret = buf
end
- raise EOFError if ret.empty?
ret
end
@@ -182,7 +181,6 @@ module OpenSSL::Buffering
buf.replace(ret)
ret = buf
end
- raise EOFError if ret.empty?
ret
end