Merge pull request #1113 from lvluoyue/patch-1

修复swow协程的错误

Author: walkor

src/Connection/TcpConnection.php

@@ -661,7 +661,7 @@ public function baseRead($socket, bool $checkEof = true): void
 
         // Check connection closed.
         if ($buffer === '' || $buffer === false) {
-            if ($checkEof && (feof($socket) || !is_resource($socket) || $buffer === false)) {
+            if ($checkEof && (!is_resource($socket) || feof($socket) || $buffer === false)) {
                 $this->destroy();
                 return;
             }
@@ -835,7 +835,7 @@ public function baseWrite(): void
      */
     public function doSslHandshake($socket): bool|int
     {
-        if (feof($socket)) {
+        if (!is_resource($socket) || feof($socket)) {
             $this->destroy();
             return false;
         }

src/Events/Swow.php

@@ -189,14 +189,18 @@ public function onWritable($stream, callable $func): void
             try {
                 $this->writeEvents[$fd] = Coroutine::getCurrent();
                 while (true) {
-                    $rEvent = stream_poll_one($stream, STREAM_POLLOUT | STREAM_POLLHUP);
+                    if (!is_resource($stream)) {
+                        $this->offWritable($stream);
+                        break;
+                    }
                     if (!isset($this->writeEvents[$fd]) || $this->writeEvents[$fd] !== Coroutine::getCurrent()) {
                         break;
                     }
+                    $rEvent = stream_poll_one($stream, STREAM_POLLOUT | STREAM_POLLHUP, 1000);
                     if ($rEvent !== STREAM_POLLNONE) {
                         $this->safeCall($func, [$stream]);
                     }
-                    if ($rEvent !== STREAM_POLLOUT) {
+                    if ($rEvent !== STREAM_POLLOUT && $rEvent !== STREAM_POLLNONE) {
                         $this->offWritable($stream);
                         break;
                     }