test/hyperf
1
0
Fork 0
mirror of https://gitee.com/hyperf/hyperf.git synced 2024-11-29 18:27:44 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge server settings with config settings. (#5806)

Browse Source
This commit is contained in:
宣言就是Siam 2023-06-07 13:27:29 +08:00 committed by GitHub
parent 8b2850f31d
commit b39728ccd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-3.0.md
View File

@ -8,6 +8,7 @@
## Optimized
- [#5789](https://github.com/hyperf/hyperf/pull/5789) Support `psr/http-message`.
- [#5806](https://github.com/hyperf/hyperf/pull/5806) Merge swow server settings with config settings.
# v3.0.23 - 2023-06-02

1
src/server/src/SwowServer.php
View File

@ -116,6 +116,7 @@ class SwowServer implements ServerInterface
$host = $server->getHost();
$port = $server->getPort();
$callbacks = array_replace($config->getCallbacks(), $server->getCallbacks());
$server->setSettings(array_replace($config->getSettings(), $server->getSettings()));
$this->server = $this->makeServer($type, $host, $port, $server->getSettings());