Better removal of the host from the path

getkirby · Jul 30, 2019 · d782fb7 · d782fb7
1 parent 0848844
commit d782fb7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Http/Uri.php b/src/Http/Uri.php
@@ -247,7 +247,7 @@ public static function current(array $props = [], bool $forwarded = false)
         }
 
         $uri = Server::get('REQUEST_URI');
-        $uri = str_replace(Server::get('HTTP_HOST'), '', $uri);
+        $uri = preg_replace('!^(http|https)\:\/\/' . Server::get('HTTP_HOST') . '!', '', $uri);
         $uri = parse_url('http://getkirby.com' . $uri);
 
         $url = new static(array_merge([

diff --git a/tests/Http/UriTest.php b/tests/Http/UriTest.php
@@ -57,7 +57,7 @@ public function testCurrentWithRequestUri()
     public function testCurrentWithHostInRequestUri()
     {
         $_SERVER['HTTP_HOST'] = 'ktest.loc';
-        $_SERVER['REQUEST_URI'] = '/ktest.loc/';
+        $_SERVER['REQUEST_URI'] = 'http://ktest.loc/';
 
         $uri = Uri::current();
         $this->assertEquals('/', $uri->toString());
@@ -67,7 +67,7 @@ public function testCurrentWithHostInRequestUri()
     public function testCurrentWithHostAndPathInRequestUri()
     {
         $_SERVER['HTTP_HOST'] = 'ktest.loc';
-        $_SERVER['REQUEST_URI'] = '/ktest.loc/a/b';
+        $_SERVER['REQUEST_URI'] = 'http://ktest.loc/a/b';
 
         $uri = Uri::current();
         $this->assertEquals('/a/b', $uri->toString());
@@ -77,13 +77,23 @@ public function testCurrentWithHostAndPathInRequestUri()
     public function testCurrentWithHostAndSchemeInRequestUri()
     {
         $_SERVER['HTTP_HOST'] = 'ktest.loc';
-        $_SERVER['REQUEST_URI'] = '/http://ktest.loc/';
+        $_SERVER['REQUEST_URI'] = 'http://ktest.loc/';
 
         $uri = Uri::current();
         $this->assertEquals('/', $uri->toString());
         $this->assertEquals('', $uri->path());
     }
 
+    public function testCurrentWithHostInPath()
+    {
+        $_SERVER['HTTP_HOST'] = 'ktest.loc';
+        $_SERVER['REQUEST_URI'] = 'http://ktest.loc/a/b/ktest.loc';
+
+        $uri = Uri::current();
+        $this->assertEquals('/a/b/ktest.loc', $uri->toString());
+        $this->assertEquals('a/b/ktest.loc', $uri->path());
+    }
+
     public function testValidScheme()
     {
         $url = new Uri;