test/hyperf
1
0
Fork 0
mirror of https://gitee.com/hyperf/hyperf.git synced 2024-11-30 02:37:58 +08:00
Code Issues Actions 16 Packages Projects Releases Wiki Activity

fix #433: set open_http_protocol and open_http2_protocol to false when server type is tcp

Browse Source
This commit is contained in:
Ye Wenbin 2019-08-24 07:58:53 +08:00
parent 9058caa852
commit d641683bce
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/src/Port.php
View File

@ -52,6 +52,7 @@ class Port
public static function build(array $config) public static function build(array $config)
{ {
$port = new static(); $port = new static();
self::filter($config);
isset($config['name']) && $port->setName($config['name']); isset($config['name']) && $port->setName($config['name']);
isset($config['type']) && $port->setType($config['type']); isset($config['type']) && $port->setType($config['type']);
isset($config['host']) && $port->setHost($config['host']); isset($config['host']) && $port->setHost($config['host']);
@ -138,4 +139,14 @@ class Port
$this->settings = $settings; $this->settings = $settings;
return $this; return $this;
} }
private static function filter(array &$config)
{
if ($config['type'] == ServerInterface::SERVER_TCP) {
$config['settings'] = array_replace($config['settings'] ?? [], [
'open_http2_protocol' => false,
'open_http_protocol' => false,
]);
}
}
} }

5
src/server/src/Server.php
View File

@ -112,6 +112,9 @@ class Server implements ServerInterface
} else { } else {
/** @var \Swoole\Server\Port $slaveServer */ /** @var \Swoole\Server\Port $slaveServer */
$slaveServer = $this->server->addlistener($host, $port, $sockType); $slaveServer = $this->server->addlistener($host, $port, $sockType);
if (! $slaveServer) {
throw new \RuntimeException("Failed to listen server port [{$host}:{$port}]");
}
$server->getSettings() && $slaveServer->set($server->getSettings()); $server->getSettings() && $slaveServer->set($server->getSettings());
$this->registerSwooleEvents($slaveServer, $callbacks, $name); $this->registerSwooleEvents($slaveServer, $callbacks, $name);
ServerManager::add($name, [$type, $slaveServer]); ServerManager::add($name, [$type, $slaveServer]);
@ -177,7 +180,7 @@ class Server implements ServerInterface
} }
/** /**
* @param Port|SwooleServer $server * @param \Swoole\Server\Port|SwooleServer $server
*/ */
protected function registerSwooleEvents($server, array $events, string $serverName): void protected function registerSwooleEvents($server, array $events, string $serverName): void
{ {