yugui	2010-12-24 12:24:00 +0900 (Fri, 24 Dec 2010)

  New Revision: 30334

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

  Log:
    merges r29197 from trunk into ruby_1_9_2.
    --
            * ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
              blocked on Windows while blocking call for SSLSocket.  Need to 
              convert errno for letting rb_io_wait_readable detect EWOULDBLOCK.  
              Patch by arton. ref #3794.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/openssl/ossl_ssl.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30333)
+++ ruby_1_9_2/ChangeLog	(revision 30334)
@@ -1,3 +1,10 @@
+Wed Sep  8 22:46:31 2010  NAKAMURA, Hiroshi  <nahi@r...>
+
+	* ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
+	  blocked on Windows while blocking call for SSLSocket.  Need to
+	  convert errno for letting rb_io_wait_readable detect EWOULDBLOCK.
+	  Patch by arton. ref #3794.
+
 Thu Dec 23 23:29:04 2010  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* common.mk, win32/Makefile.sub: fixes dependencies.
Index: ruby_1_9_2/ext/openssl/ossl_ssl.c
===================================================================
--- ruby_1_9_2/ext/openssl/ossl_ssl.c	(revision 30333)
+++ ruby_1_9_2/ext/openssl/ossl_ssl.c	(revision 30334)
@@ -1018,7 +1018,7 @@
 }
 
 #ifdef _WIN32
-#define ssl_get_error(ssl, ret) (errno = WSAGetLastError(), SSL_get_error(ssl, ret))
+#define ssl_get_error(ssl, ret) (errno = rb_w32_map_errno(WSAGetLastError()), SSL_get_error(ssl, ret))
 #else
 #define ssl_get_error(ssl, ret) SSL_get_error(ssl, ret)
 #endif
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30333)
+++ ruby_1_9_2/version.h	(revision 30334)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 134
+#define RUBY_PATCHLEVEL 135
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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