Merge pull request #572 from getsentry/fix-pr-558

Handle and add non default port to host (#558)
getsentry · Mar 20, 2018 · f3aa013 · f3aa013
2 parents 047f0d3 + 402199f
commit f3aa013
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/lib/Raven/Client.php b/lib/Raven/Client.php
@@ -1306,6 +1306,11 @@ protected function get_current_url()
             : (!empty($_SERVER['LOCAL_ADDR'])  ? $_SERVER['LOCAL_ADDR']
             : (!empty($_SERVER['SERVER_ADDR']) ? $_SERVER['SERVER_ADDR'] : '')));
 
+        $hasNonDefaultPort = !empty($_SERVER['SERVER_PORT']) && !in_array((int)$_SERVER['SERVER_PORT'], array(80, 443));
+        if ($hasNonDefaultPort && !preg_match('#:[0-9]*$#', $host)) {
+            $host .= ':' . $_SERVER['SERVER_PORT'];
+        }
+
         $httpS = $this->isHttps() ? 's' : '';
         return "http{$httpS}://{$host}{$_SERVER['REQUEST_URI']}";
     }

diff --git a/test/Raven/Tests/ClientTest.php b/test/Raven/Tests/ClientTest.php
@@ -1665,6 +1665,16 @@ public function currentUrlProvider()
                 array('trust_x_forwarded_proto' => true),
                 'https://example.com/',
                 'The url is expected to be https because the X-Forwarded header is trusted'
+            ),
+            array(
+                array(
+                    'REQUEST_URI' => '/',
+                    'HTTP_HOST' => 'example.com',
+                    'SERVER_PORT' => 81
+                ),
+                array(),
+                'http://example.com:81/',
+                'Port is not appended'
             )
         );
     }