fixed #250 websocket header信息检查时不区分大小写

暴露addWorker方法，方便用户自定义进程
top-think · Jun 4, 2021 · 915ce6e · 915ce6e
1 parent 61c4b9f
commit 915ce6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/concerns/InteractsWithHttp.php b/src/concerns/InteractsWithHttp.php
@@ -37,8 +37,8 @@ public function createHttpServer()
 
         $server->handle('/', function (Request $req, Response $res) {
             $header = $req->header;
-            if (Arr::get($header, 'connection') == 'upgrade' &&
-                Arr::get($header, 'upgrade') == 'websocket' &&
+            if (strcasecmp(Arr::get($header, 'connection'), 'upgrade') === 0 &&
+                strcasecmp(Arr::get($header, 'upgrade'), 'websocket') === 0 &&
                 $this->wsEnable
             ) {
                 $this->onHandShake($req, $res);

diff --git a/src/concerns/InteractsWithServer.php b/src/concerns/InteractsWithServer.php
@@ -29,15 +29,15 @@ trait InteractsWithServer
     /** @var Pool */
     protected $pool;
 
-    protected function addBatchWorker(int $workerNum, callable $func)
+    public function addBatchWorker(int $workerNum, callable $func)
     {
         for ($i = 0; $i < $workerNum; $i++) {
             $this->startFuncMap[] = $func;
         }
         return $this;
     }
 
-    protected function addWorker(callable $func): self
+    public function addWorker(callable $func): self
     {
         $this->addBatchWorker(1, $func);
         return $this;
@@ -50,9 +50,10 @@ public function start(): void
     {
         Runtime::enableCoroutine();
 
+        $this->setProcessName('manager process');
+
         $this->initialize();
         $this->triggerEvent('init');
-        $this->setProcessName('manager process');
 
         //热更新
         if ($this->getConfig('hot_update.enable', false)) {