From 8e96c2c57b853b5b3e246d67d4d0b3c820a95223 Mon Sep 17 00:00:00 2001 From: tenderlove Date: Fri, 7 Jan 2011 16:32:10 +0000 Subject: [PATCH] reverting r30451 until I can figure out what is wrong. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ------ ext/openssl/ossl_ssl.c | 5 +---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 991bee7560..50c26c33dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,12 +81,6 @@ Wed Jan 5 13:56:54 2011 Akinori MUSHA * lib/net/http.rb (Net::HTTP#get): A header hash given should not be modified. -Wed Jan 5 13:56:03 2011 Aaron Patterson - - * 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 * ext/dl/{cfunc.c,dl.h,handle.c}, ext/fiddle/fiddle.{h,c}: Use _WIN32 diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index c6f7d17231..e26be8a365 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -960,11 +960,8 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self) static void ossl_ssl_shutdown(SSL *ssl) { - int dead; if (ssl) { - do { - dead = SSL_shutdown(ssl); - } while(!dead); + SSL_shutdown(ssl); SSL_clear(ssl); } }