From fde5c3ff928fb42d30595f7e2a75bf7e123e5973 Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 26 May 2004 18:11:29 +0000
Subject: * ext/openssl/ossl_ssl.c (ossl_ssl_read): take optional second
 argument   to specify a string to be written.

* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#read):
  take optional second argument to specify a string to be written.

* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#gets):
  refine regexp for end-of-line.

* ext/opnessl/lib/openssl/ssl.rb
  (OpenSSL::SSL::SocketForwarder#listen): fix typo.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/openssl/lib/openssl/buffering.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'ext/openssl/lib/openssl/buffering.rb')

diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index fdbd71bc0c..6fcb143fc8 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -54,14 +54,19 @@ module Buffering
 
   public
 
-  def read(size=nil)
+  def read(size=nil, buf=nil)
     fill_rbuff unless defined? @rbuffer
     @eof ||= nil
     until @eof
       break if size && size <= @rbuffer.size
       fill_rbuff
     end
-    consume_rbuff(size)
+    ret = consume_rbuff(size) || ""
+    if buf
+      buf.replace(ret)
+      ret = buf
+    end
+    (size && ret.empty?) ? nil : ret
   end
 
   def gets(eol=$/)
@@ -164,7 +169,7 @@ module Buffering
     s = ""
     args.each{|arg|
       s << arg.to_s
-      unless /#{$/}\Z/o =~ s
+      unless /#{$/}\z/o =~ s
         s << $/
       end
     }
-- 
cgit v1.2.3