[前][次][番号順一覧][スレッド一覧]

ruby-changes:18465

From: tenderlove <ko1@a...>
Date: Sat, 8 Jan 2011 01:32:21 +0900 (JST)
Subject: [ruby-changes:18465] Ruby:r30488 (trunk): reverting r30451 until I can figure out what is wrong.

tenderlove	2011-01-08 01:32:10 +0900 (Sat, 08 Jan 2011)

  New Revision: 30488

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

  Log:
    reverting r30451 until I can figure out what is wrong.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30487)
+++ ChangeLog	(revision 30488)
@@ -81,12 +81,6 @@
 	* lib/net/http.rb (Net::HTTP#get): A header hash given should not
 	  be modified.
 
-Wed Jan  5 13:56:03 2011  Aaron Patterson <aaron@t...>
-
-	* ext/openssl/ossl_ssl.c: SSL_shutdown should be called until the
-	  return value is non-zero:
-	  http://www.openssl.org/docs/ssl/SSL_shutdown.html
-
 Wed Jan  5 12:10:08 2011  Aaron Patterson <aaron@t...>
 
 	* ext/dl/{cfunc.c,dl.h,handle.c}, ext/fiddle/fiddle.{h,c}: Use _WIN32
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 30487)
+++ ext/openssl/ossl_ssl.c	(revision 30488)
@@ -960,11 +960,8 @@
 static void
 ossl_ssl_shutdown(SSL *ssl)
 {
-    int dead;
     if (ssl) {
-	do {
-	    dead = SSL_shutdown(ssl);
-	} while(!dead);
+	SSL_shutdown(ssl);
         SSL_clear(ssl);
     }
 }

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

[前][次][番号順一覧][スレッド一覧]