Skip to content

Commit 6f30676

Browse files
author
ncomputers.org
committed
RewriteRule ^ %{REQUEST_URI} is faster than ^(.*)$ $1
1 parent c4a5bae commit 6f30676

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

server/conf/vhost.conf.master

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -443,17 +443,17 @@
443443
<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
444444
RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
445445
</tmpl_if>
446-
RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,NE,L]
446+
RewriteRule ^ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>%{REQUEST_URI} [R=301,NE,L]
447447
</tmpl_if>
448448
<tmpl_loop name="alias_seo_redirects">
449449
RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_redirect_operator'>^<tmpl_var name='alias_seo_redirect_origin_domain'>$ [NC]
450450
<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
451451
RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
452452
</tmpl_if>
453-
RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,NE,L]
453+
RewriteRule ^ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>%{REQUEST_URI} [R=301,NE,L]
454454
</tmpl_loop>
455455
<tmpl_loop name="redirects">
456-
RewriteCond %{HTTP_HOST} <tmpl_var name='rewrite_domain'>$ [NC]
456+
RewriteCond %{HTTP_HOST} <tmpl_var name='rewrite_domain'>$ [NC]
457457
<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
458458
RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
459459
</tmpl_if>
@@ -462,8 +462,7 @@
462462
RewriteCond %{REQUEST_URI} !^/php5-fcgi/
463463
RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
464464
</tmpl_if>
465-
466-
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if> <tmpl_var name='rewrite_type'>
465+
RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if> <tmpl_var name='rewrite_type'>
467466

468467
</tmpl_loop>
469468
<tmpl_if name='ssl_enabled'>

0 commit comments

Comments
 (0)