Merge pull request #137 from Textalk/persistent-fix

Fix for persistent connection in client

Author: sirn-se

lib/Client.php

@@ -128,6 +128,8 @@ protected function connect(): void
             throw new ConnectionException($error);
         }
 
+        $address = "{$scheme}://{$host}{$path_with_query}";
+
         if (!$persistent || ftell($this->socket) == 0) {
             // Set timeout on the stream as well.
             stream_set_timeout($this->socket, $this->options['timeout']);
@@ -177,10 +179,6 @@ function ($key, $value) {
             // Get server response header (terminated with double CR+LF).
             $response = stream_get_line($this->socket, 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}";