Simplify HTTP request handling

Author: walkor

src/Connection/TcpConnection.php

@@ -19,13 +19,9 @@
 use RuntimeException;
 use stdClass;
 use Throwable;
-use Workerman\Events\Ev;
-use Workerman\Events\Event;
 use Workerman\Events\EventInterface;
-use Workerman\Events\Select;
 use Workerman\Protocols\Http;
 use Workerman\Protocols\Http\Request;
-use Workerman\Protocols\ProtocolInterface;
 use Workerman\Worker;
 
 use function ceil;
@@ -252,11 +248,6 @@ class TcpConnection extends ConnectionInterface implements JsonSerializable
      */
     public array $headers = [];
 
-    /**
-     * @var ?Request
-     */
-    public ?Request $request = null;
-
     /**
      * Is safe.
      *
@@ -672,9 +663,7 @@ public function baseRead($socket, bool $checkEof = true): void
                     ++self::$statistics['total_request'];
                     if ($this->protocol === Http::class) {
                         $request = clone $requests[$buffer];
-                        $request->destroy();
                         $request->connection = $this;
-                        $this->request = $request;
                         try {
                             ($this->onMessage)($this, $request);
                         } catch (Throwable $e) {
@@ -750,7 +739,6 @@ public function baseRead($socket, bool $checkEof = true): void
                         ($this->onMessage)($this, $request);
                         if ($request instanceof Request) {
                             $requests[$oneRequestBuffer] = clone $request;
-                            $requests[$oneRequestBuffer]->destroy();
                         } else {
                             $requests[$oneRequestBuffer] = $request;
                         }
@@ -771,7 +759,7 @@ public function baseRead($socket, bool $checkEof = true): void
             return;
         }
 
-        // Applications protocol is not set.
+        // Application protocol is not set.
         ++self::$statistics['total_request'];
         try {
             ($this->onMessage)($this, $this->recvBuffer);
@@ -1060,7 +1048,6 @@ public function destroy(): void
                 $this->error($e);
             }
         }
-        $this->request = null;
         $this->sendBuffer = $this->recvBuffer = '';
         $this->currentPackageLength = 0;
         $this->isPaused = $this->sslHandshakeCompleted = false;

src/Protocols/Http.php

@@ -136,9 +136,7 @@ public static function decode(string $buffer, TcpConnection $connection): Reques
         static $requests = [];
         if (isset($requests[$buffer])) {
             $request = $requests[$buffer];
-            $request->destroy();
             $request->connection = $connection;
-            $connection->request = $request;
             return $request;
         }
         $request = new static::$requestClass($buffer);
@@ -150,7 +148,6 @@ public static function decode(string $buffer, TcpConnection $connection): Reques
             $request = clone $request;
         }
         $request->connection = $connection;
-        $connection->request = $request;
         return $request;
     }
 
@@ -163,11 +160,6 @@ public static function decode(string $buffer, TcpConnection $connection): Reques
      */
     public static function encode(mixed $response, TcpConnection $connection): string
     {
-        $request = null;
-        if (isset($connection->request)) {
-            $request = $connection->request;
-            $request->connection = $connection->request = null;
-        }
 
         if (!is_object($response)) {
             $extHeader = '';
@@ -197,19 +189,9 @@ public static function encode(mixed $response, TcpConnection $connection): strin
         }
 
         if (isset($response->file)) {
-            $requestRange = [0, 0];
-            if ($value = $request?->header('range')) {
-                if (str_starts_with($value, 'bytes=')) {
-                    $arr = explode('-', substr($value, 6));
-                    if (count($arr) === 2) {
-                        $requestRange = [(int)$arr[0], (int)$arr[1]];
-                    }
-                }
-            }
-
             $file = $response->file['file'];
-            $offset = $response->file['offset'] ?: $requestRange[0];
-            $length = $response->file['length'] ?: $requestRange[1];
+            $offset = $response->file['offset'] ?: 0;
+            $length = $response->file['length'] ?: 0;
             clearstatcache();
             $fileSize = (int)filesize($file);
             $bodyLen = $length > 0 ? $length : $fileSize - $offset;

src/Protocols/Http/Request.php

@@ -734,7 +734,7 @@ public function __unset(string $name): void
     }
 
     /**
-     * __wakeup.
+     * Wakeup.
      *
      * @return void
      */
@@ -744,11 +744,11 @@ public function __wakeup(): void
     }
 
     /**
-     * Destroy.
+     * Clone.
      *
      * @return void
      */
-    public function destroy(): void
+    public function __clone(): void
     {
         if ($this->context) {
             $this->context  = [];
@@ -757,6 +757,15 @@ public function destroy(): void
             $this->properties = [];
         }
         $this->connection = null;
+    }
+
+    /**
+     * Destructor.
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
         if (isset($this->data['files']) && $this->isSafe) {
             clearstatcache();
             array_walk_recursive($this->data['files'], function ($value, $key) {

src/Protocols/Http/Response.php

@@ -550,7 +550,10 @@ public function __toString(): string
         if (!isset($headers['Content-Type'])) {
             $head .= "Content-Type: text/html;charset=utf-8\r\n";
         } else if ($headers['Content-Type'] === 'text/event-stream') {
-            return $head . $this->body;
+            // For Server-Sent Events, send headers once and keep the connection open.
+            // Headers must be terminated by an empty line; ignore any preset body to avoid
+            // polluting the event stream with extra bytes or OS-specific newlines.
+            return $head . "\r\n";
         }
 
         if (!isset($headers['Transfer-Encoding'])) {