[ruby-cvs:61590] nagachika:r54428 (ruby_2_2): merge revision(s) 54258: [Backport #12182]

[nagachika at ruby-lang.org]

nagachika	2016-03-30 05:36:59 +0900 (Wed, 30 Mar 2016)

  New Revision: 54428

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

  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_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/openssl/extconf.rb
    branches/ruby_2_2/ext/openssl/ossl_ssl.c
    branches/ruby_2_2/test/openssl/test_ssl.rb
    branches/ruby_2_2/version.h