From 905981da5a99ba7bbd3752a78e77965dd91d90c2 Mon Sep 17 00:00:00 2001
From: Bastian Allgeier <mail@bastianallgeier.com>
Date: Thu, 24 Mar 2022 11:02:36 +0100
Subject: [PATCH] Upgrade to 3.6.3.1

---
 kirby/composer.json                 | 2 +-
 kirby/composer.lock                 | 2 +-
 kirby/src/Http/Server.php           | 9 ++++++++-
 kirby/vendor/composer/installed.php | 8 ++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/kirby/composer.json b/kirby/composer.json
index ff3beb4..a6d1896 100755
--- a/kirby/composer.json
+++ b/kirby/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/kirby/composer.lock b/kirby/composer.lock
index 2b33619..2bf6d2f 100755
--- a/kirby/composer.lock
+++ b/kirby/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d4cf75084dae428fe0ab54124637d51f",
+    "content-hash": "a83b6521ea01c32fbdce60852c237a74",
     "packages": [
         {
             "name": "claviska/simpleimage",
diff --git a/kirby/src/Http/Server.php b/kirby/src/Http/Server.php
index d418273..d343254 100755
--- a/kirby/src/Http/Server.php
+++ b/kirby/src/Http/Server.php
@@ -268,7 +268,14 @@ class Server
     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/kirby/vendor/composer/installed.php b/kirby/vendor/composer/installed.php
index 9284ed1..47755ef 100755
--- a/kirby/vendor/composer/installed.php
+++ b/kirby/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(),