ruby-changes:28665
From: usa <ko1@a...>
Date: Tue, 14 May 2013 11:35:50 +0900 (JST)
Subject: [ruby-changes:28665] usa:r40717 (ruby_1_9_3): merge revision(s) 40304: [Backport #8267]
usa 2013-05-14 11:35:39 +0900 (Tue, 14 May 2013) New Revision: 40717 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40717 Log: merge revision(s) 40304: [Backport #8267] * ext/openssl/ossl_ssl.c: Correct shutdown behavior w.r.t GC. * test/openssl/test_ssl.rb: Add tests to verify correct behavior. [Bug #8240] Patch provided by Shugo Maeda. Thanks! Modified directories: branches/ruby_1_9_3/ Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/ext/openssl/ossl_ssl.c branches/ruby_1_9_3/test/openssl/test_ssl.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 40716) +++ ruby_1_9_3/ChangeLog (revision 40717) @@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1 +Tue May 14 11:24:22 2013 Martin Bosslet <Martin.Bosslet@g...> + + * ext/openssl/ossl_ssl.c: Correct shutdown behavior w.r.t GC. + + * test/openssl/test_ssl.rb: Add tests to verify correct behavior. + + [Bug #8240] Patch provided by Shugo Maeda. Thanks! + Tue May 14 11:22:33 2013 Naohisa Goto <ngotogenome@g...> * configure.in (AC_CHECK_HEADERS): atomic.h for Solaris atomic_ops. Index: ruby_1_9_3/ext/openssl/ossl_ssl.c =================================================================== --- ruby_1_9_3/ext/openssl/ossl_ssl.c (revision 40716) +++ ruby_1_9_3/ext/openssl/ossl_ssl.c (revision 40717) @@ -995,7 +995,6 @@ ossl_ssl_shutdown(SSL *ssl) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/openssl/ossl_ssl.c#L995 static void ossl_ssl_free(SSL *ssl) { - ossl_ssl_shutdown(ssl); SSL_free(ssl); } @@ -1405,9 +1404,16 @@ ossl_ssl_close(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ext/openssl/ossl_ssl.c#L1404 SSL *ssl; Data_Get_Struct(self, SSL, ssl); - ossl_ssl_shutdown(ssl); - if (RTEST(ossl_ssl_get_sync_close(self))) - rb_funcall(ossl_ssl_get_io(self), rb_intern("close"), 0); + if (ssl) { + VALUE io = ossl_ssl_get_io(self); + if (!RTEST(rb_funcall(io, rb_intern("closed?"), 0))) { + ossl_ssl_shutdown(ssl); + SSL_free(ssl); + DATA_PTR(self) = NULL; + if (RTEST(ossl_ssl_get_sync_close(self))) + rb_funcall(io, rb_intern("close"), 0); + } + } return Qnil; } Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 40716) +++ ruby_1_9_3/version.h (revision 40717) @@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1 #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 420 +#define RUBY_PATCHLEVEL 421 #define RUBY_RELEASE_DATE "2013-05-14" #define RUBY_RELEASE_YEAR 2013 Index: ruby_1_9_3/test/openssl/test_ssl.rb =================================================================== --- ruby_1_9_3/test/openssl/test_ssl.rb (revision 40716) +++ ruby_1_9_3/test/openssl/test_ssl.rb (revision 40717) @@ -438,6 +438,33 @@ class OpenSSL::TestSSL < OpenSSL::SSLTes https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/openssl/test_ssl.rb#L438 } end + def test_invalid_shutdown_by_gc + assert_nothing_raised { + start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port| + 10.times { + sock = TCPSocket.new("127.0.0.1", port) + ssl = OpenSSL::SSL::SSLSocket.new(sock) + GC.start + ssl.connect + sock.close + } + } + } + end + + def test_close_after_socket_close + start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true){|server, port| + sock = TCPSocket.new("127.0.0.1", port) + ssl = OpenSSL::SSL::SSLSocket.new(sock) + ssl.sync_close = true + ssl.connect + sock.close + assert_nothing_raised do + ssl.close + end + } + end + end end Property changes on: ruby_1_9_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r40304 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/