Merge pull request #1334 from respire/fix_minissl_socket_blocking_close

fix #1214 Puma >= 3.6.1 + SSL + Persistent Connections. Puma Hangs :(

lib/puma/minissl.rb

@@ -96,33 +96,26 @@ module Puma
         @socket.flush
       end
 
+      def read_and_drop(timeout = 1)
+        return :timeout unless IO.select([@socket], nil, nil, timeout)
+        read_nonblock(1024)
+        :drop
+      rescue Errno::EAGAIN
+        # do nothing
+        :eagain
+      end
+
+      def should_drop_bytes?
+        @engine.init? || !@engine.shutdown
+      end
+
       def close
         begin
-          # Try to setup (so that we can then close them) any
+          # Read any drop any partially initialized sockets and any received bytes during shutdown.
-          # partially initialized sockets.
-          while @engine.init?
           # Don't let this socket hold this loop forever.
-            # If it can't send more packets within 1s, then
+          # If it can't send more packets within 1s, then give up.
-            # give up.
+          while should_drop_bytes?
-            return unless IO.select([@socket], nil, nil, 1)
+            return if read_and_drop(1) == :timeout
-            begin
-              read_nonblock(1024)
-            rescue Errno::EAGAIN
-            end
-          end
-
-          done = @engine.shutdown
-
-          while true
-            enc = @engine.extract
-            @socket.write enc
-
-            notify = @socket.sysread(1024)
-
-            @engine.inject notify
-            done = @engine.shutdown
-
-            break if done
           end
         rescue IOError, SystemCallError
           # nothing