Code optimization

walkor · walkor · commit b2e99500670a · 2024-12-28T16:30:49.000+08:00
diff --git a/src/Protocols/Http.php b/src/Protocols/Http.php
@@ -98,8 +98,12 @@ public static function input(string $buffer, TcpConnection $connection): int
         }
 
         $header = substr($buffer, 0, $crlfPos);
-        if (preg_match("/\r\ncontent-length: ?(\d+)/i", $header, $match)) {
-            $length += (int)$match[1];
+        if (preg_match('/\b(?:Transfer-Encoding\b.*)|(?:Content-Length:\s*(\d+)(?!.*\bTransfer-Encoding\b))/is', $header, $matches)) {
+            if (!isset($matches[1])) {
+                $connection->close("HTTP/1.1 400 Bad Request\r\nContent-Length: 0\r\n\r\n", true);
+                return 0;
+            }
+            $length += (int)$matches[1];
         }
 
         if ($length > $connection->maxPackageSize) {

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,12 @@ public static function input(string $buffer, TcpConnection $connection): int`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`$header = substr($buffer, 0, $crlfPos);`
`101`		`- if (preg_match("/\r\ncontent-length: ?(\d+)/i", $header, $match)) {`
`102`		`- $length += (int)$match[1];`
	`101`	`+ if (preg_match('/\b(?:Transfer-Encoding\b.)\|(?:Content-Length:\s(\d+)(?!.*\bTransfer-Encoding\b))/is', $header, $matches)) {`
	`102`	`+ if (!isset($matches[1])) {`
	`103`	`+ $connection->close("HTTP/1.1 400 Bad Request\r\nContent-Length: 0\r\n\r\n", true);`
	`104`	`+ return 0;`
	`105`	`+ }`
	`106`	`+ $length += (int)$matches[1];`
`103`	`107`	`}`
`104`	`108`
`105`	`109`	`if ($length > $connection->maxPackageSize) {`