From dfb1e5be932ca4bd0ba8ece207826593589a6b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Thu, 4 Feb 2021 18:32:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HttpServer/Server.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HttpServer/Server.php b/HttpServer/Server.php index 37efdb41..c0b07e88 100644 --- a/HttpServer/Server.php +++ b/HttpServer/Server.php @@ -358,6 +358,9 @@ class Server extends Application if ($this->isUse($config['port'])) { return $this->error_stop($config['host'], $config['port']); } + if (isset($config['settings']) && !empty($config['settings'])) { + $settings = array_merge($settings, $config['settings']); + } $this->baseServer = new $class($config['host'], $config['port'], SWOOLE_PROCESS, $config['mode']); $settings['daemonize'] = $this->daemon; if (!isset($settings['pid_file'])) {