Replace repeated regex with constant

amphp · Dec 10, 2024 · 955b246 · 955b246
1 parent 97a40cc
commit 955b246
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/Driver/Http1Driver.php b/src/Driver/Http1Driver.php
@@ -250,7 +250,7 @@ public function handleClient(
                     throw new ClientException($this->client, "Bad Request: multiple host headers", HttpStatus::BAD_REQUEST);
                 }
 
-                if (!\preg_match("#^([A-Z\d._\-]+|\[[\d:]+])(?::([1-9]\d*))?$#i", $headers["host"][0], $matches)) {
+                if (!\preg_match(self::HOST_HEADER_REGEX, $headers["host"][0], $matches)) {
                     throw new ClientException($this->client, "Bad Request: invalid host header", HttpStatus::BAD_REQUEST);
                 }
 
@@ -317,7 +317,7 @@ public function handleClient(
                             );
                         }
 
-                        if (!\preg_match("#^([A-Z\d._\-]+|\[[\d:]+]):([1-9]\d*)$#i", $target, $matches)) {
+                        if (!\preg_match(self::HOST_HEADER_REGEX, $target, $matches)) {
                             throw new ClientException(
                                 $this->client,
                                 "Bad Request: invalid connect target",

diff --git a/src/Driver/Http2Driver.php b/src/Driver/Http2Driver.php
@@ -967,7 +967,7 @@ public function handleHeaders(int $streamId, array $pseudo, array $headers, bool
         [':method' => $method, ':path' => $target, ':scheme' => $scheme, ':authority' => $host] = $pseudo;
         $query = null;
 
-        if (!\preg_match("#^([A-Z\d._\-]+|\[[\d:]+])(?::([1-9]\d*))?$#i", $host, $matches)) {
+        if (!\preg_match(self::HOST_HEADER_REGEX, $host, $matches)) {
             throw new Http2StreamException(
                 "Invalid authority (host) name",
                 $streamId,

diff --git a/src/Driver/Internal/AbstractHttpDriver.php b/src/Driver/Internal/AbstractHttpDriver.php
@@ -17,6 +17,8 @@
 /** @internal */
 abstract class AbstractHttpDriver implements HttpDriver
 {
+    protected const HOST_HEADER_REGEX = /** @lang RegExp */ '#^([A-Z\d._\-]+|\[[\d:]+])(?::([1-9]\d*))?$#i';
+
     private static ?TimeoutQueue $timeoutQueue = null;
 
     final protected static function getTimeoutQueue(): TimeoutQueue