Merge pull request #40 from sirn-se/headerfix

Allow additional content in Connection header during handshake
sirn-se · Feb 16, 2024 · feb6fd3 · feb6fd3
2 parents 6d21dfb + 7cf68ca
commit feb6fd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -6,6 +6,10 @@
 
  > PHP version `^8.0`
 
+### `2.1.3`
+
+ * Allow additional content in Connection header during handshake (@sirn-se)
+
 ### `2.1.2`
 
  * Allow repeated headers when pulling HTTP messages (@sirn-se)

diff --git a/src/Server.php b/src/Server.php
@@ -436,7 +436,7 @@ protected function performHandshake(Connection $connection): ServerRequest
                 );
             }
             $connectionHeader = trim($request->getHeaderLine('Connection'));
-            if (strtolower($connectionHeader) != 'upgrade') {
+            if (!str_contains('upgrade', strtolower($connectionHeader))) {
                 throw new HandshakeException(
                     "Handshake request with invalid Connection header: '{$connectionHeader}'",
                     $response->withStatus(426)