Merge pull request #14 from sloonz/master

Adds port in host request-header during handshake.
Textalk · Mar 19, 2015 · 634493a · 634493a
2 parents 8eb985d + 5e1c22c
commit 634493a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/Client.php b/lib/Client.php
@@ -70,7 +70,7 @@ protected function connect() {
 
     // Default headers (using lowercase for simpler array_merge below).
     $headers = array(
-      'host'                  => $host,
+      'host'                  => $host . ":" . $port,
       'user-agent'            => 'websocket-client-php',
       'connection'            => 'Upgrade',
       'upgrade'               => 'websocket',

diff --git a/tests/unit/ClientTest.php b/tests/unit/ClientTest.php
@@ -231,7 +231,7 @@ public function testDefaultHeaders() {
 
     $this->assertRegExp(
       "/GET \/$this->test_id HTTP\/1.1\r\n"
-      . "host: localhost\r\n"
+      . "host: localhost:".self::$port."\r\n"
       . "user-agent: websocket-client-php\r\n"
       . "connection: Upgrade\r\n"
       . "upgrade: websocket\r\n"
@@ -251,7 +251,7 @@ public function testUserAgentOverride() {
 
     $this->assertRegExp(
       "/GET \/$this->test_id HTTP\/1.1\r\n"
-      . "host: localhost\r\n"
+      . "host: localhost:".self::$port."\r\n"
       . "user-agent: Deep thought\r\n"
       . "connection: Upgrade\r\n"
       . "upgrade: websocket\r\n"
@@ -271,7 +271,7 @@ public function testAddingHeaders() {
 
     $this->assertRegExp(
       "/GET \/$this->test_id HTTP\/1.1\r\n"
-      . "host: localhost\r\n"
+      . "host: localhost:".self::$port."\r\n"
       . "user-agent: websocket-client-php\r\n"
       . "connection: Upgrade\r\n"
       . "upgrade: websocket\r\n"