Merge pull request #8112 from michalsn/fix/hot-reloader

fix: Hot reloading when session is enabled
codeigniter4 · Oct 30, 2023 · 0872a21 · 0872a21
2 parents 6c06f84 + e2ed766
commit 0872a21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -23,7 +23,7 @@
 </style>
 
 <script id="toolbar_js">
-    var ciSiteURL = "<?= site_url() ?>"
+    var ciSiteURL = "<?= rtrim(site_url(), '/') ?>"
     <?= file_get_contents(__DIR__ . '/toolbar.js') ?>
 </script>
 <div id="debug-icon" class="debug-bar-ndisplay">

diff --git a/system/HotReloader/HotReloader.php b/system/HotReloader/HotReloader.php
@@ -18,6 +18,10 @@ final class HotReloader
 {
     public function run(): void
     {
+        if (session_status() === PHP_SESSION_ACTIVE) {
+            session_write_close();
+        }
+
         ini_set('zlib.output_compression', 'Off');
 
         header('Cache-Control: no-store');