mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
b101d2c2b1
commit
07decad25f
1 changed files with 3 additions and 5 deletions
|
@ -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!(/(?<!\n)\z/, "\n")
|
||||
}
|
||||
do_write(s)
|
||||
nil
|
||||
|
|
Loading…
Reference in a new issue