Merge branch 'master' into schneems/puma-stats

.travis.yml

@@ -11,9 +11,10 @@ branches:
   only:
     - "master"
 rvm:
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
+  - 2.2.9
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
   - jruby-9.1.15.0
   - jruby-head

test/test_puma_server_ssl.rb

@@ -62,8 +62,6 @@ class TestPumaServerSSL < Minitest::Test
   end
 
   def test_url_scheme_for_https
-    return if DISABLE_SSL
-
     body = nil
     @http.start do
       req = Net::HTTP::Get.new "/", {}
@@ -77,8 +75,6 @@ class TestPumaServerSSL < Minitest::Test
   end
 
   def test_very_large_return
-    return if DISABLE_SSL
-
     giant = "x" * 2056610
 
     @server.app = proc do
@@ -97,8 +93,6 @@ class TestPumaServerSSL < Minitest::Test
   end
 
   def test_form_submit
-    return if DISABLE_SSL
-
     body = nil
     @http.start do
       req = Net::HTTP::Post.new '/'
@@ -114,7 +108,6 @@ class TestPumaServerSSL < Minitest::Test
   end
 
   def test_ssl_v3_rejection
-    return if DISABLE_SSL
     @http.ssl_version='SSLv3'
     assert_raises(OpenSSL::SSL::SSLError) do
       @http.start do