[ruby-cvs:61434] usa:r54272 (ruby_2_1): merge revision(s) 46108, 46209, 46223, 46297, 48223, 48224: [Backport #12168]

usa at ruby-lang.org usa at ruby-lang.org
Fri Mar 25 18:06:16 JST 2016


usa	2016-03-25 18:06:16 +0900 (Fri, 25 Mar 2016)

  New Revision: 54272

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54272

  Log:
    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.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/openssl/lib/openssl/ssl.rb
    branches/ruby_2_1/ext/openssl/ossl_ssl.c
    branches/ruby_2_1/test/openssl/test_pair.rb
    branches/ruby_2_1/test/openssl/test_ssl.rb
    branches/ruby_2_1/test/openssl/utils.rb
    branches/ruby_2_1/test/ruby/envutil.rb
    branches/ruby_2_1/test/ruby/test_io.rb
    branches/ruby_2_1/version.h


More information about the ruby-cvs mailing list