From 07decad25f969908f7b2cc97208548605e35c5db Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 25 Jan 2018 11:21:47 +0000 Subject: [PATCH] openssl/buffering.rb: no RS when output * ext/openssl/lib/openssl/buffering.rb (do_write, puts): output methods should not be affected by the input record separator. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/lib/openssl/buffering.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb index 935f61f0ef..1f2b2a7e44 100644 --- a/ext/openssl/lib/openssl/buffering.rb +++ b/ext/openssl/lib/openssl/buffering.rb @@ -316,8 +316,8 @@ module OpenSSL::Buffering @wbuffer << s @wbuffer.force_encoding(Encoding::BINARY) @sync ||= false - if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex($/) - remain = idx ? idx + $/.size : @wbuffer.length + if @sync or @wbuffer.size > BLOCK_SIZE or idx = @wbuffer.rindex("\n") + remain = idx ? idx + 1 : @wbuffer.size nwritten = 0 while remain > 0 str = @wbuffer[nwritten,remain] @@ -409,9 +409,7 @@ module OpenSSL::Buffering end args.each{|arg| s << arg.to_s - if $/ && /\n\z/ !~ s - s << "\n" - end + s.sub!(/(?