Ruby » Ruby master

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