lib\puma\accept_nonblock.rb - fix socket closing on error (#1941)

* lib\puma\accept_nonblock.rb - fix socket closing on error See: ruby/ruby@68ac33a * test/test_integration.rb - fix my typo that causes a warning
puma · Sep 5, 2019 · 7e82738 · 7e82738
1 parent c9a584c
commit 7e82738
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/puma/accept_nonblock.rb b/lib/puma/accept_nonblock.rb
@@ -15,7 +15,11 @@ def accept_nonblock
             ssl.accept if @start_immediately
             ssl
           rescue SSLError => ex
-            sock.close
+            if ssl
+              ssl.close
+            else
+              sock.close
+            end
             raise ex
           end
         end

diff --git a/test/test_integration.rb b/test/test_integration.rb
@@ -517,5 +517,5 @@ def run_launcher(conf)
     @wait.sysread 1
 
     [thr, launcher, @events]
-   end
+  end
 end