nahi	2010-09-08 22:52:25 +0900 (Wed, 08 Sep 2010)

  New Revision: 29197

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

  Log:
    * 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:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29196)
+++ ChangeLog	(revision 29197)
@@ -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.
+
 Wed Sep  8 20:56:57 2010  Tanaka Akira  <akr@f...>
 
 	* ext/pathname/pathname.c (path_setgid_p): Pathname#setgid? translated
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 29196)
+++ ext/openssl/ossl_ssl.c	(revision 29197)
@@ -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

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