[ruby-cvs:61713] naruse:r54551 (ruby_2_3): merge revision(s) 54258: [Backport #12182]

naruse at ruby-lang.org naruse at ruby-lang.org
Tue Apr 12 14:29:12 JST 2016


naruse	2016-04-12 14:29:12 +0900 (Tue, 12 Apr 2016)

  New Revision: 54551

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

  Log:
    merge revision(s) 54258: [Backport #12182]
    
    * ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
      function rather than OPENSSL_NPN_NEGOTIATED macro. it exists
      even if it is disabled by OpenSSL configuration.
      [ruby-core:74384] [Bug #12182]
    
    * ext/openssl/ossl_ssl.c: update #ifdef(s) as above.
    
    * test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/ext/openssl/extconf.rb
    branches/ruby_2_3/ext/openssl/ossl_ssl.c
    branches/ruby_2_3/test/openssl/test_ssl.rb
    branches/ruby_2_3/version.h


More information about the ruby-cvs mailing list