usa	2007-10-15 17:29:08 +0900 (Mon, 15 Oct 2007)

  New Revision: 13706

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/openssl/lib/openssl/buffering.rb

  Log:
    * ext/openssl/lib/openssl/buffering.rb (read, readpartial): revert
      r12496. handling EOF is a little differnt in ruby 1.8 and ruby 1.9.
      [ruby-dev:31979]
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13706&r2=13705
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/openssl/lib/openssl/buffering.rb?r1=13706&r2=13705

Index: ruby_1_8/ext/openssl/lib/openssl/buffering.rb
===================================================================
--- ruby_1_8/ext/openssl/lib/openssl/buffering.rb	(revision 13705)
+++ ruby_1_8/ext/openssl/lib/openssl/buffering.rb	(revision 13706)
@@ -57,10 +57,10 @@
     if size == 0
       if buf
         buf.clear
-        return buf
       else
-        return ""
+        buf = ""
       end
+      return @eof ? nil : buf
     end
     until @eof
       break if size && size <= @rbuffer.size
@@ -78,10 +78,10 @@
     if maxlen == 0
       if buf
         buf.clear
-        return buf
       else
-        return ""
+        buf = ""
       end
+      return @eof ? nil : buf
     end
     if @rbuffer.empty?
       begin
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13705)
+++ ruby_1_8/ChangeLog	(revision 13706)
@@ -1,3 +1,9 @@
+Mon Oct 15 17:28:20 2007  NAKAMURA Usaku  <usa@r...>
+
+	* ext/openssl/lib/openssl/buffering.rb (read, readpartial): revert
+	  r12496. handling EOF is a little differnt in ruby 1.8 and ruby 1.9.
+	  [ruby-dev:31979]
+
 Mon Oct 15 11:45:12 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* marshal.c (r_bytes0): refined length check.  [ruby-dev:32059]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml