[ruby-cvs:61590] nagachika:r54428 (ruby_2_2): merge revision(s) 54258: [Backport #12182]
nagachika at ruby-lang.org
nagachika at ruby-lang.org
Wed Mar 30 05:36:59 JST 2016
- Previous message: [ruby-cvs:61589] nagachika:r54427 (ruby_2_2): merge revision(s) 54257: [Backport #12215]
- Next message: [ruby-cvs:61591] nagachika:r54429 (ruby_2_2): merge revision(s) 49176, 49334, 49802, 49814, 49815, 49816, 50036, 51453, 51705, 51706, 51708, 51805, 51807, 53298, 53517, 53519, 53521, 53522, 53523, 53526, 53527, 54017, 54034:
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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
- Previous message: [ruby-cvs:61589] nagachika:r54427 (ruby_2_2): merge revision(s) 54257: [Backport #12215]
- Next message: [ruby-cvs:61591] nagachika:r54429 (ruby_2_2): merge revision(s) 49176, 49334, 49802, 49814, 49815, 49816, 50036, 51453, 51705, 51706, 51708, 51805, 51807, 53298, 53517, 53519, 53521, 53522, 53523, 53526, 53527, 54017, 54034:
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the ruby-cvs
mailing list