Fix hang on shutdown in test_refork [changelog skip]

lib/puma/cluster.rb

@@ -479,7 +479,9 @@ def wait_workers
         rescue Errno::ECHILD
           begin
             Process.kill(0, w.pid)
-            false # child still alive, but has another parent
+            # child still alive but has another parent (e.g., using fork_worker)
+            w.term if w.term?
+            false
           rescue Errno::ESRCH, Errno::EPERM
             true # child is already terminated
           end

lib/puma/cluster/worker.rb

@@ -91,6 +91,7 @@ def run
 
         Signal.trap "SIGTERM" do
           @worker_write << "e#{Process.pid}\n" rescue nil
+          restart_server.clear
           server.stop
           restart_server << false
         end

test/test_puma_server.rb

@@ -1150,4 +1150,15 @@ def test_run_stop_thread_safety
       assert thread.join(1)
     end
   end
+
+  def test_command_ignored_before_run
+    @server.stop # ignored
+    @server.run
+    @server.halt
+    done = Queue.new
+    @server.events.register(:state) do |state|
+      done << @server.instance_variable_get(:@status) if state == :done
+    end
+    assert_equal :halt, done.pop
+  end
 end