summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/openssl/ossl_ssl.c5
2 files changed, 1 insertions, 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 <knu@iDaemons.org>
* 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@tenderlovemaking.com>
-
- * 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@tenderlovemaking.com>
* 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);
}
}