mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/openssl/ossl_ssl.c: Support disabling OpenSSL compression.
* test/openssl/test_ssl.rb: Add a test for it. Thanks to Eric Wong for the patch. [Ruby 1.9 - Feature #5183] [ruby-core:38911] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
63ad065026
commit
1be5789eed
3 changed files with 19 additions and 0 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
Mon Aug 15 09:58:55 2011 Martin Bosslet <Martin.Bosslet@googlemail.com>
|
||||||
|
|
||||||
|
* ext/openssl/ossl_ssl.c: Support disabling OpenSSL compression.
|
||||||
|
* test/openssl/test_ssl.rb: Add a test for it.
|
||||||
|
Thanks to Eric Wong for the patch.
|
||||||
|
[Ruby 1.9 - Feature #5183] [ruby-core:38911]
|
||||||
|
|
||||||
Sun Aug 14 05:57:01 2011 Tanaka Akira <akr@fsij.org>
|
Sun Aug 14 05:57:01 2011 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* test/socket/test_socket.rb (test_connect_timeout): added a test
|
* test/socket/test_socket.rb (test_connect_timeout): added a test
|
||||||
|
|
|
@ -1996,6 +1996,9 @@ Init_ossl_ssl()
|
||||||
ossl_ssl_def_const(OP_NO_TLSv1);
|
ossl_ssl_def_const(OP_NO_TLSv1);
|
||||||
#if defined(SSL_OP_NO_TICKET)
|
#if defined(SSL_OP_NO_TICKET)
|
||||||
ossl_ssl_def_const(OP_NO_TICKET);
|
ossl_ssl_def_const(OP_NO_TICKET);
|
||||||
|
#endif
|
||||||
|
#if defined(SSL_OP_NO_COMPRESSION)
|
||||||
|
ossl_ssl_def_const(OP_NO_COMPRESSION);
|
||||||
#endif
|
#endif
|
||||||
ossl_ssl_def_const(OP_PKCS1_CHECK_1);
|
ossl_ssl_def_const(OP_PKCS1_CHECK_1);
|
||||||
ossl_ssl_def_const(OP_PKCS1_CHECK_2);
|
ossl_ssl_def_const(OP_PKCS1_CHECK_2);
|
||||||
|
|
|
@ -9,6 +9,15 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
|
||||||
assert_equal(ctx.setup, nil)
|
assert_equal(ctx.setup, nil)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_ctx_setup_no_compression
|
||||||
|
ctx = OpenSSL::SSL::SSLContext.new
|
||||||
|
ctx.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_COMPRESSION
|
||||||
|
assert_equal(ctx.setup, true)
|
||||||
|
assert_equal(ctx.setup, nil)
|
||||||
|
assert_equal(OpenSSL::SSL::OP_NO_COMPRESSION,
|
||||||
|
ctx.options & OpenSSL::SSL::OP_NO_COMPRESSION)
|
||||||
|
end if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
|
||||||
|
|
||||||
def test_not_started_session
|
def test_not_started_session
|
||||||
skip "non socket argument of SSLSocket.new is not supported on this platform" if /mswin|mingw/ =~ RUBY_PLATFORM
|
skip "non socket argument of SSLSocket.new is not supported on this platform" if /mswin|mingw/ =~ RUBY_PLATFORM
|
||||||
open(__FILE__) do |f|
|
open(__FILE__) do |f|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue