* 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

1 files changed, 11 insertions, 0 deletions

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