mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Merge branch 'master' into schneems/puma-stats
This commit is contained in:
commit
1e69dac8a8
2 changed files with 4 additions and 10 deletions
|
@ -11,9 +11,10 @@ branches:
|
||||||
only:
|
only:
|
||||||
- "master"
|
- "master"
|
||||||
rvm:
|
rvm:
|
||||||
- 2.2.8
|
- 2.2.9
|
||||||
- 2.3.5
|
- 2.3.6
|
||||||
- 2.4.2
|
- 2.4.3
|
||||||
|
- 2.5.0
|
||||||
- ruby-head
|
- ruby-head
|
||||||
- jruby-9.1.15.0
|
- jruby-9.1.15.0
|
||||||
- jruby-head
|
- jruby-head
|
||||||
|
|
|
@ -62,8 +62,6 @@ class TestPumaServerSSL < Minitest::Test
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_url_scheme_for_https
|
def test_url_scheme_for_https
|
||||||
return if DISABLE_SSL
|
|
||||||
|
|
||||||
body = nil
|
body = nil
|
||||||
@http.start do
|
@http.start do
|
||||||
req = Net::HTTP::Get.new "/", {}
|
req = Net::HTTP::Get.new "/", {}
|
||||||
|
@ -77,8 +75,6 @@ class TestPumaServerSSL < Minitest::Test
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_very_large_return
|
def test_very_large_return
|
||||||
return if DISABLE_SSL
|
|
||||||
|
|
||||||
giant = "x" * 2056610
|
giant = "x" * 2056610
|
||||||
|
|
||||||
@server.app = proc do
|
@server.app = proc do
|
||||||
|
@ -97,8 +93,6 @@ class TestPumaServerSSL < Minitest::Test
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_form_submit
|
def test_form_submit
|
||||||
return if DISABLE_SSL
|
|
||||||
|
|
||||||
body = nil
|
body = nil
|
||||||
@http.start do
|
@http.start do
|
||||||
req = Net::HTTP::Post.new '/'
|
req = Net::HTTP::Post.new '/'
|
||||||
|
@ -114,7 +108,6 @@ class TestPumaServerSSL < Minitest::Test
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_ssl_v3_rejection
|
def test_ssl_v3_rejection
|
||||||
return if DISABLE_SSL
|
|
||||||
@http.ssl_version='SSLv3'
|
@http.ssl_version='SSLv3'
|
||||||
assert_raises(OpenSSL::SSL::SSLError) do
|
assert_raises(OpenSSL::SSL::SSLError) do
|
||||||
@http.start do
|
@http.start do
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue