From c261d0d3f749ecf2dc2c9f88cb3aec0bd4bfa785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vilius=20=C5=A0umskas?= <vilius@sumskas.eu>
Date: Fri, 17 Mar 2023 16:53:45 +0200
Subject: [PATCH] Fix force_ssl redirect in case of undefined hostname (#3702)

---
 system/src/Grav/Common/Service/PagesServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/src/Grav/Common/Service/PagesServiceProvider.php b/system/src/Grav/Common/Service/PagesServiceProvider.php
index 52ef5eae3..0e10d144e 100644
--- a/system/src/Grav/Common/Service/PagesServiceProvider.php
+++ b/system/src/Grav/Common/Service/PagesServiceProvider.php
@@ -72,7 +72,7 @@ class PagesServiceProvider implements ServiceProviderInterface
                 if ($config->get('system.force_ssl')) {
                     $scheme = $uri->scheme(true);
                     if ($scheme !== 'https') {
-                        $url = 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                        $url = 'https://' . $uri->host() . $uri->uri();
                         $grav->redirect($url);
                     }
                 }