diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-25 09:06:16 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-25 09:06:16 +0000 |
| commit | d82440ff9cb17b8a32a5eeb7dd838588468b39f4 (patch) | |
| tree | 9759434fa98d3d07cd81becd133efb52b6762386 /ChangeLog | |
| parent | 6827f86c519421fbbcc772c83845ada36f6bc5d5 (diff) | |
merge revision(s) 46108,46209,46223,46297,48223,48224: [Backport #12168]
* test/openssl: Join threads.
* ext/openssl/ossl_ssl.c (ossl_ssl_close): Fix sync_close to work
when SSL is not started.
This fix the fd leak by test_https_proxy_authentication in
test/net/http/test_https_proxy.rb.
* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket
if any exception occur.
* test/ruby/envutil.rb (assert_join_threads): New assertion to
join multiple threads without exceptions.
* test/openssl/utils.rb (start_server, server_loop): Use a
pipe to stop server instead of shutdown/close a listening socket.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 26 |
1 files changed, 26 insertions, 0 deletions
@@ -1,3 +1,29 @@ +Fri Mar 25 17:52:46 2016 Tanaka Akira <akr@fsij.org> + + * test/openssl/utils.rb (start_server, server_loop): Use a + pipe to stop server instead of shutdown/close a listening socket. + +Fri Mar 25 17:52:46 2016 Tanaka Akira <akr@fsij.org> + + * test/ruby/envutil.rb (assert_join_threads): New assertion to + join multiple threads without exceptions. + +Fri Mar 25 17:52:46 2016 Tanaka Akira <akr@fsij.org> + + * ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket + if any exception occur. + +Fri Mar 25 17:52:46 2016 Tanaka Akira <akr@fsij.org> + + * ext/openssl/ossl_ssl.c (ossl_ssl_close): Fix sync_close to work + when SSL is not started. + This fix the fd leak by test_https_proxy_authentication in + test/net/http/test_https_proxy.rb. + +Fri Mar 25 17:52:46 2016 Tanaka Akira <akr@fsij.org> + + * test/openssl: Join threads. + Fri Mar 25 17:47:06 2016 NARUSE, Yui <naruse@ruby-lang.org> * insns.def (opt_mod): show its method name on ZeroDivisionError. |