emboss	2012-05-25 22:24:47 +0900 (Fri, 25 May 2012)

  New Revision: 35795

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35795

  Log:
    * ext/openssl/ossl_ssl.c: Revert r35583
    * test/openssl/test_ssl.rb: Handle ECONNRESET in code instead to avoid
    the test failing in Ruby CI [1]
    
    [1] http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T190102Z.log.html.gz#test-all

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c
    trunk/test/openssl/test_ssl.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35794)
+++ ChangeLog	(revision 35795)
@@ -1,3 +1,11 @@
+Fri May 25 22:19:40 2012  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* ext/openssl/ossl_ssl.c: Revert r35583
+	* test/openssl/test_ssl.rb: Handle ECONNRESET in code instead to avoid
+	the test failing in Ruby CI [1]
+	
+	[1] http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20120507T190102Z.log.html.gz#test-all
+
 Fri May 25 19:51:36 2012  Koichi Sasada  <ko1@a...>
 
 	* vm_eval.c (rb_f_caller): caller() method accepts second optional
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 35794)
+++ ext/openssl/ossl_ssl.c	(revision 35795)
@@ -1158,6 +1158,7 @@
             rb_io_wait_readable(FPTR_TO_FD(fptr));
             continue;
 	case SSL_ERROR_SYSCALL:
+	    if (errno) rb_sys_fail(funcname);
 	    ossl_raise(eSSLError, "%s SYSCALL returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
 	default:
 	    ossl_raise(eSSLError, "%s returned=%d errno=%d state=%s", funcname, ret2, errno, SSL_state_string_long(ssl));
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 35794)
+++ test/openssl/test_ssl.rb	(revision 35795)
@@ -516,6 +516,8 @@
     ssl.sync_close = true
     ssl.connect
     yield ssl
+  rescue Errno::ECONNRESET => e
+    raise OpenSSL::SSL::SSLError.new(e.message)
   ensure
     ssl.close
   end

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