summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-28 23:32:46 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-28 23:32:46 +0000
commit8cd1c4ddab456bd5084d9272bb335e11a3651232 (patch)
treeff14359cbe5c3c48bd83defd16e41f8ba4a6cb57 /ext
parentb337563fba42e8a531e6c96c98568491e2b0a7c2 (diff)
merges r31113 from trunk into ruby_1_9_2.
-- * ext/openssl/lib/openssl/buffering.rb (module OpenSSL): #flush should not change sync mode on exception. * test/openssl/test_buffering.rb: added git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/openssl/lib/openssl/buffering.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 3028fe5b52..cc1f08f563 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -328,6 +328,8 @@ module Buffering
osync = @sync
@sync = true
do_write ""
+ return self
+ ensure
@sync = osync
end