调整websocket与http默认设置

Author: flxxyz

example.php

@@ -11,9 +11,8 @@
         'port'    => '9000',
         'type'    => SWOOLE_SOCK_TCP,
         'setting' => [
-            'open_http_protocol'      => false,
-            'open_websocket_protocol' => true,
-            'task_worker_num'         => 1,
+            'daemonize'       => false,
+            'task_worker_num' => 1,
         ],
         'handler' => \swoole_websocket_and_tcp_and_udp_test\webscoket::class,
     ],
@@ -22,10 +21,7 @@
         'host'    => '0.0.0.0',
         'port'    => '9001',
         'type'    => SWOOLE_SOCK_TCP,
-        'setting' => [
-            'open_http_protocol' => true,
-            'daemonize'          => false,
-        ],
+        'setting' => [],
         'handler' => \swoole_websocket_and_tcp_and_udp_test\http::class,
     ],
     'tcp'                 => [

src/Server.php

@@ -35,10 +35,23 @@ public function __construct($config)
         if (isset($this->config['websocket'])) {
             $this->enableWebsocket = true;
             $this->primaryConfig = $this->config['websocket'];
+            $this->primaryConfig['setting']['open_websocket_protocol'] = true;
+            if(!isset($this->primaryConfig['setting']['open_http_protocol'])) {
+                $this->primaryConfig['setting']['open_http_protocol'] = true;
+            }
+            if(!isset($this->primaryConfig['setting']['daemonize'])) {
+                $this->primaryConfig['setting']['daemonize'] = false;
+            }
+
             $serverClass = \swoole_websocket_server::class;
         } else {
             if (isset($this->config['http'])) {
                 $this->primaryConfig = $this->config['http'];
+                $this->primaryConfig['setting']['open_http_protocol'] = true;
+                if(!isset($this->primaryConfig['setting']['daemonize'])) {
+                    $this->primaryConfig['setting']['daemonize'] = false;
+                }
+
                 $serverClass = \swoole_http_server::class;
             }
         }