Prevent URL redirect looping in 404 page

i1li · web-flow · commit c89c1ef79da6 · 2025-11-22T20:24:51.000-06:00
Added check to prevent URL redirect looping in 404 handler.
diff --git a/dist/404.html b/dist/404.html
@@ -26,10 +26,19 @@
 (() => {
   const pathSegmentsToKeep = 0;
   let l = new URL(window.location);
-  l.pathname = '/' + l.pathname.split('/').slice(1, 1 + pathSegmentsToKeep).join('/') + '/?/' +
-    l.pathname.slice(1).split('/').slice(pathSegmentsToKeep).join('/').replace(/&/g, '~and~');
-  l.search = l.search ? '&' + l.search.slice(1).replace(/&/g, '~and~') : '';
-  window.SPA404Redirect = l;
-  window.location.replace(l.href);
+
+  // Check if the URL is already in redirect format to prevent looping
+  if (!l.search.startsWith('?/')) {
+    const basePath = '/' + l.pathname.split('/').slice(1, 1 + pathSegmentsToKeep).join('/');
+    const restPath = l.pathname.slice(1).split('/').slice(pathSegmentsToKeep).join('/');
+    const newPath = basePath + (basePath.endsWith('/') ? '' : '/') + '?/' + restPath.replace(/&/g, '~and~');
+    const newSearch = l.search ? '&' + l.search.slice(1).replace(/&/g, '~and~') : '';
+
+    l.pathname = newPath;
+    l.search = newSearch;
+
+    window.SPA404Redirect = l;
+    window.location.replace(l.href);
+  }
 })();
 </script></head><body></body></html>
