Merge branch 'master' into v1.6-master

Author: sirn-se

docs/Changelog.md

@@ -4,7 +4,7 @@
 
 ## `v1.6`
 
- > PHP version `^7.2`
+ > PHP version `^7.2|^8.0`
 
 ### `1.6.0`
 
@@ -14,7 +14,11 @@
 
 ## `v1.5`
 
- > PHP version `^7.2`
+ > PHP version `^7.2|^8.0`
+
+### `1.5.3`
+
+ * Fix for persistent connection (@sirn-se)
 
 ### `1.5.2`
 

lib/Client.php

@@ -440,6 +440,8 @@ protected function connect(): void
             throw new ConnectionException($error);
         }
 
+        $address = "{$scheme}://{$host}{$path_with_query}";
+
         if (!$persistent || $this->connection->tell() == 0) {
             // Set timeout on the stream as well.
             $this->connection->setTimeout($this->options['timeout']);
@@ -489,10 +491,6 @@ function ($key, $value) {
             // Get server response header (terminated with double CR+LF).
             $response = $this->connection->getLine(1024, "\r\n\r\n");
 
-            /// @todo Handle version switching
-
-            $address = "{$scheme}://{$host}{$path_with_query}";
-
             // Validate response.
             if (!preg_match('#Sec-WebSocket-Accept:\s(.*)$#mUi', $response, $matches)) {
                 $error = "Connection to '{$address}' failed: Server sent invalid upgrade response: {$response}";