Merge pull request #4221 from getkirby/release/3.6.3.1

Fix path detection in Server::requestUri
getkirby · Mar 24, 2022 · e8a40bf · e8a40bf
2 parents 6b20fa1 + 5e196e0
commit e8a40bf
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "The Kirby 3 core",
   "license": "proprietary",
   "type": "kirby-cms",
-  "version": "3.6.3",
+  "version": "3.6.3.1",
   "keywords": [
     "kirby",
     "cms",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Http/Server.php b/src/Http/Server.php
@@ -268,7 +268,14 @@ public static function port(bool $forwarded = false): int
     public static function requestUri(): array
     {
         $uri = static::get('REQUEST_URI', '');
-        $uri = parse_url($uri);
+
+        if (Url::isAbsolute($uri) === true) {
+            $uri = parse_url($uri);
+        } else {
+            // the fake domain is needed to make sure the URL parsing is
+            // always correct. Even if there's a colon in the path for params
+            $uri = parse_url('http://getkirby.com' . $uri);
+        }
 
         return [
             'path'  => $uri['path']  ?? null,

diff --git a/tests/Http/ServerTest.php b/tests/Http/ServerTest.php
@@ -360,7 +360,7 @@ public function provideRequestUri(): array
             [
                 null,
                 [
-                    'path'  => '',
+                    'path'  => null,
                     'query' => null
                 ]
             ],
@@ -385,10 +385,24 @@ public function provideRequestUri(): array
                     'query' => 'foo=bar'
                 ]
             ],
+            [
+                '/foo/bar/page:2?foo=bar',
+                [
+                    'path'  => '/foo/bar/page:2',
+                    'query' => 'foo=bar'
+                ]
+            ],
+            [
+                '/foo/bar/page;2?foo=bar',
+                [
+                    'path'  => '/foo/bar/page;2',
+                    'query' => 'foo=bar'
+                ]
+            ],
             [
                 'index.php?foo=bar',
                 [
-                    'path'  => 'index.php',
+                    'path'  => null,
                     'query' => 'foo=bar'
                 ]
             ],

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -1,7 +1,7 @@
 <?php return array(
     'root' => array(
-        'pretty_version' => '3.6.3',
-        'version' => '3.6.3.0',
+        'pretty_version' => '3.6.3.1',
+        'version' => '3.6.3.1',
         'type' => 'kirby-cms',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -29,8 +29,8 @@
             'dev_requirement' => false,
         ),
         'getkirby/cms' => array(
-            'pretty_version' => '3.6.3',
-            'version' => '3.6.3.0',
+            'pretty_version' => '3.6.3.1',
+            'version' => '3.6.3.1',
             'type' => 'kirby-cms',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),