[ruby-cvs:53759] nagachika:r46613 (ruby_2_1): merge revision(s) r45863, r45871: [Backport #9750]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Mon Jun 30 02:26:55 JST 2014


nagachika	2014-06-30 02:26:54 +0900 (Mon, 30 Jun 2014)

  New Revision: 46613

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

  Log:
    merge revision(s) r45863,r45871: [Backport #9750]
    
    * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#accept):
      Consider Socket#accept as well as TCPServer#accept.
      Reported by Sam Stelfox.  [ruby-core:62064] [Bug #9750]

  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/test/openssl/test_pair.rb
    branches/ruby_2_1/version.h


More information about the ruby-cvs mailing list