Project

General

Profile

Bug #12168

Backport r48224 to 2.1

Added by ReiOdaira (Rei Odaira) about 3 years ago. Updated about 3 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Target version:
-
[ruby-core:74272]

Description

This is a ticket to back-port r48224 (and the fixes on which it depends) to 2.1. Ruby 2.1 gets stuck in test/openssl/test_ssl.rb on AIX, and r48224 solves this problem. r48224 depends on r46108, r46209, r46223, r46297, and r48223.

Associated revisions

Revision d82440ff
Added by usa (Usaku NAKAMURA) about 3 years ago

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

Revision 54272
Added by usa (Usaku NAKAMURA) about 3 years ago

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.

History

Updated by usa (Usaku NAKAMURA) about 3 years ago

  • Backport changed from 2.1: REQUIRED, 2.2: DONTNEED, 2.3: DONTNEED to 2.1: DONE, 2.2: DONTNEED, 2.3: DONTNEED

ruby_2_1 r54272 merged revision(s) 46108,46209,46223,46297,48223,48224.

Also available in: Atom PDF