From 57eb29c3c82ad4067de1f0c03c1ff163e1355e19 Mon Sep 17 00:00:00 2001 From: Roy-Orbison Date: Mon, 7 Feb 2022 16:00:57 +1030 Subject: [PATCH] Optimise RewriteRules/Conds From upstream changes on Mezzio Skeleton. Closes #1369. --- public/.htaccess | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/.htaccess b/public/.htaccess index 32a4fd27..affe2ed1 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -4,7 +4,7 @@ RewriteEngine On RewriteCond %{REQUEST_FILENAME} -f [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d -RewriteRule ^.*$ - [NC,L] +RewriteRule ^ - [NC,L] # The following rewrites all other queries to index.php. The # condition ensures that if you are using Apache aliases to do @@ -12,6 +12,6 @@ RewriteRule ^.*$ - [NC,L] # allow proper resolution of the index.php file; it will work # in non-aliased environments as well, providing a safe, one-size # fits all solution. -RewriteCond %{REQUEST_URI}::$1 ^(/.+)(.+)::\2$ -RewriteRule ^(.*) - [E=BASE:%1] -RewriteRule ^(.*)$ %{ENV:BASE}index.php [NC,L] +RewriteCond $0::%{REQUEST_URI} ^([^:]*+(?::[^:]*+)*?)::(/.+?)\1$ +RewriteRule .+ - [E=BASE:%2] +RewriteRule .* %{ENV:BASE}index.php [NC,L]