fix: forceSecureAccess() position

It was before the event `pre_system`.
codeigniter4 · Oct 22, 2023 · df3d93a · df3d93a
1 parent b1c9fb8
commit df3d93a
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -339,6 +339,20 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
         $this->getRequestObject();
         $this->getResponseObject();
 
+        try {
+            $this->forceSecureAccess();
+        } catch (RedirectException $e) {
+            $this->response = $e->getResponse();
+
+            if ($returnResponse) {
+                return $this->response;
+            }
+
+            $this->sendResponse();
+
+            return;
+        }
+
         Events::trigger('pre_system');
 
         $this->benchmark->stop('bootstrap');
@@ -354,8 +368,6 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
             $this->response = $possibleResponse;
         } else {
             try {
-                $this->forceSecureAccess();
-
                 $this->response = $this->handleRequest($routes, config(Cache::class), $returnResponse);
             } catch (ResponsableInterface|DeprecatedRedirectException $e) {
                 $this->outputBufferingEnd();