Close idle connections immediately on shutdown (#2460)

History.md

@@ -8,6 +8,7 @@
 * Bugfixes
   * Your bugfix goes here <Most recent on the top, like GitHub> (#Github Number)
   * Ignore illegal (by Rack spec) response header (#2439)
+  * Close idle connections immediately on shutdown (#2460)
   
 ## 5.0.3 / 2020-10-26
 

lib/puma/client.rb

@@ -239,13 +239,8 @@ module Puma
     # @version 5.0.0
     #
     def can_close?
-      # Allow connection to close if it's received at least one full request
-      # and hasn't received any data for a future request.
-      #
-      # From RFC 2616 section 8.1.4:
-      # Servers SHOULD always respond to at least one request per connection,
-      # if at all possible.
-      @requests_served > 0 && @parsed_bytes == 0
+      # Allow connection to close if we're not in the middle of parsing a request.
+      @parsed_bytes == 0
     end
 
     private

test/test_puma_server.rb

@@ -1143,6 +1143,18 @@ EOF
     assert_empty @events.stdout.string
   end
 
+  def test_idle_connections_closed_immediately_on_shutdown
+    server_run
+    sock = new_connection
+    sleep 0.5 # give enough time for new connection to enter reactor
+    @server.stop false
+
+    assert IO.select([sock], nil, nil, 1), 'Unexpected timeout'
+    assert_raises EOFError do
+      sock.read_nonblock(256)
+    end
+  end
+
   def test_run_stop_thread_safety
     100.times do
       thread = @server.run