From 0f8f2be4c173701ab36540e926c797b681879b92 Mon Sep 17 00:00:00 2001
From: MARiA so cute <33935209+NathanFreeman@users.noreply.github.com>
Date: Wed, 20 Nov 2024 08:56:57 +0800
Subject: [PATCH] Fix bug #5558 (#5571)

---
 ext-src/swoole_server.cc                  |  3 +-
 tests/swoole_server/named_parameters.phpt | 46 +++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 tests/swoole_server/named_parameters.phpt

diff --git a/ext-src/swoole_server.cc b/ext-src/swoole_server.cc
index 52f425a567..d52bc4ca85 100644
--- a/ext-src/swoole_server.cc
+++ b/ext-src/swoole_server.cc
@@ -3809,7 +3809,7 @@ static PHP_METHOD(swoole_server, stop) {
     }
 
     zend_bool wait_reactor = 0;
-    zend_long worker_id = SwooleG.process_id;
+    zend_long worker_id = -1;
 
     ZEND_PARSE_PARAMETERS_START(0, 2)
     Z_PARAM_OPTIONAL
@@ -3817,6 +3817,7 @@ static PHP_METHOD(swoole_server, stop) {
     Z_PARAM_BOOL(wait_reactor)
     ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
 
+    worker_id = worker_id < 0 ? SwooleG.process_id : worker_id;
     if (worker_id == SwooleG.process_id && wait_reactor == 0) {
         if (SwooleTG.reactor != nullptr) {
             SwooleTG.reactor->defer(
diff --git a/tests/swoole_server/named_parameters.phpt b/tests/swoole_server/named_parameters.phpt
new file mode 100644
index 0000000000..c5f433aabc
--- /dev/null
+++ b/tests/swoole_server/named_parameters.phpt
@@ -0,0 +1,46 @@
+--TEST--
+swoole_server: new twice
+--SKIPIF--
+<?php
+require __DIR__ . '/../include/skipif.inc';
+?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+use Swoole\Constant;
+use Swoole\Http\Server;
+use Swoole\Event;
+$pm = new SwooleTest\ProcessManager;
+$atomic = new Swoole\Atomic();
+$pm->parentFunc = function ($pid) use ($pm, $atomic) {
+    posix_kill($atomic->get(), SIGINT);
+    $pm->wait();
+    $pm->kill();
+};
+$pm->childFunc = function () use ($pm, $atomic) {
+    $http = new Server('0.0.0.0', 9501, SWOOLE_PROCESS);
+    $http->set([
+        Constant::OPTION_WORKER_NUM => 1
+    ]);
+    $http->on('WorkerStart', function () use ($pm, $http, $atomic) {
+        if ($atomic->get() == 0) {
+            $atomic->set(posix_getpid());
+            Event::defer(function () use ($pm) {
+                $pm->wakeup();
+            });
+            Swoole\Coroutine\System::waitSignal(SIGINT);
+            var_dump($http->stop(waitEvent: true), $http->getLastError());
+        } else {
+            $pm->wakeup();
+        }
+    });
+    $http->on('request', function () {
+    });
+    $http->start();
+};
+$pm->childFirst();
+$pm->run();
+?>
+--EXPECT--
+bool(true)
+int(0)