* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,

  ossl_ssl_write):
  - need to set errno on Win32 platform.
  - should call rb_sys_fail instead of rasing SSLError if
    SSL_ERROR_SYSCALL occured.
  - should wait for that the underlying IO become readable or
    writable if the error was SSL_ERROR_WANT_READ or
    SSL_ERROR_WANT_WRITE. [ruby-dev:25795]

* ext/openssl/lib/openssl/buffering.rb
  (Buffering#initialize): should set @eof and @rbuffer.
  (Buffering#fill_rbuff): should rescue Errno::EAGAIN.
  (Buffering#consume_rbuf): pointless eof flag resetting is deleted.
  (Buffering#read): should return an empty string if the specified
  size is zero.
  (Buffering#readpartial): new method.
  (Buffering#readline): fix typo.
  (Buffering#getc): return the first character of string correctly.
  (Buffering#each): fix typo.  suggested by Brian Ollenberger.
  (Buffering#readchar): fix typo.
  (Buffering#eof?): should read again it the input buffer is empty.
  (Buffering#do_write): should rescue Errno::EAGAIN.
  (Buffering#puts): use "\n" as the output field separator.

* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
  underlying IO.

* ext/openssl/extconf.rb: get rid of GNUmakefile generation.

* text/openssl/test_pair.rb: test for IO like methods.

* test/ruby/ut_eof.rb: test about empty file.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 66 insertions, 16 deletions

diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 31dcdf1f9a..bd11afe043 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -20,6 +20,8 @@ module Buffering
   BLOCK_SIZE = 1024*16
 
   def initialize(*args)
+    @eof = false
+    @rbuffer = ""
     @sync = @io.sync
   end
 
@@ -29,17 +31,17 @@ module Buffering
   private
 
   def fill_rbuff
-    @rbuffer = "" unless defined? @rbuffer
     begin
       @rbuffer << self.sysread(BLOCK_SIZE)
+    rescue Errno::EAGAIN
+      retry
     rescue EOFError
       @eof = true
     end
   end
 
   def consume_rbuff(size=nil)
-    if @rbuffer.size == 0
-      @eof = nil
+    if @rbuffer.empty?
       nil
     else
       size = @rbuffer.size unless size
@@ -52,8 +54,14 @@ module Buffering
   public
 
   def read(size=nil, buf=nil)
-    fill_rbuff unless defined? @rbuffer
-    @eof ||= nil
+    if size == 0
+      if buf
+        buf.clear
+      else
+        buf = ""
+      end
+      return @eof ? nil : buf
+    end
     until @eof
       break if size && size <= @rbuffer.size
       fill_rbuff
@@ -66,10 +74,33 @@ module Buffering
     (size && ret.empty?) ? nil : ret
   end
 
+  def readpartial(maxlen, buf=nil)
+    if maxlen == 0
+      if buf
+        buf.clear
+      else
+        buf = ""
+      end
+      return @eof ? nil : buf
+    end
+    if @rbuffer.empty?
+      begin
+        return sysread(maxlen, buf)
+      rescue Errno::EAGAIN
+        retry
+      end
+    end
+    ret = consume_rbuff(maxlen)
+    if buf
+      buf.replace(ret)
+      ret = buf
+    end
+    raise EOFError if ret.empty?
+    ret
+  end
+
   def gets(eol=$/)
-    fill_rbuff unless defined? @rbuffer
     idx = @rbuffer.index(eol)
-    @eof ||= nil
     until @eof
       break if idx
       fill_rbuff
@@ -84,7 +115,7 @@ module Buffering
   end
 
   def each(eol=$/)
-    while line = self.gets(eol?)
+    while line = self.gets(eol)
       yield line
     end
   end
@@ -99,13 +130,13 @@ module Buffering
   end
 
   def readline(eol=$/)
-    raise EOFErorr if eof?
+    raise EOFError if eof?
     gets(eol)
   end
 
   def getc
     c = read(1)
-    c ? c.to_i : nil
+    c ? c[0] : nil
   end
 
   def each_byte
@@ -115,7 +146,7 @@ module Buffering
   end
 
   def readchar
-    raise EOFErorr if eof?
+    raise EOFError if eof?
     getc
   end
 
@@ -124,8 +155,8 @@ module Buffering
   end
 
   def eof?
-    @eof ||= nil
-    @eof && @rbuffer.size == 0
+    fill_rbuff if !@eof && @rbuffer.empty?
+    @eof && @rbuffer.empty?
   end
   alias eof eof?
 
@@ -142,7 +173,12 @@ module Buffering
       remain = idx ? idx + $/.size : @wbuffer.length
       nwritten = 0
       while remain > 0
-        nwrote = syswrite(@wbuffer[nwritten,remain])
+        str = @wbuffer[nwritten,remain]
+        begin
+          nwrote = syswrite(str)
+        rescue Errno::EAGAIN
+          retry
+        end
         remain -= nwrote
         nwritten += nwrote
       end
@@ -164,10 +200,13 @@ module Buffering
 
   def puts(*args)
     s = ""
+    if args.empty?
+      s << "\n"
+    end
     args.each{|arg|
       s << arg.to_s
-      unless /#{$/}\z/o =~ s
-        s << $/
+      if $/ && /\n\z/ !~ s
+        s << "\n"
       end
     }
     do_write(s)
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index 9c31fa73cd..441890865b 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -16,6 +16,7 @@
 
 require "openssl"
 require "openssl/buffering"
+require "fcntl"
 
 module OpenSSL
   module SSL
@@ -49,9 +50,19 @@ module OpenSSL
       end
     end
 
+    module Nonblock
+      def initialize(*args)
+        flag = File::NONBLOCK
+        flag |= @io.fcntl(Fcntl::F_GETFL) if defined?(Fcntl::F_GETFL)
+        @io.fcntl(Fcntl::F_SETFL, flag)
+        super
+      end
+    end
+
     class SSLSocket
       include Buffering
       include SocketForwarder
+      include Nonblock
 
       def post_connection_check(hostname)
         check_common_name = true