From 6f306764cb23cd5ee41ce8609563528fe1cd79f1 Mon Sep 17 00:00:00 2001
From: "ncomputers.org" <contact@ncomputers.org>
Date: Tue, 21 Mar 2017 21:11:29 -0600
Subject: [PATCH 1/2] RewriteRule ^ %{REQUEST_URI} is faster than ^(.*)$ $1

---
 server/conf/vhost.conf.master | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index c8ead10334..8705db7ebe 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -443,17 +443,17 @@
 		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
 		RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
 		</tmpl_if>
-		RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>$1 [R=301,NE,L]
+		RewriteRule ^ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='seo_redirect_target_domain'>%{REQUEST_URI} [R=301,NE,L]
 </tmpl_if>
 <tmpl_loop name="alias_seo_redirects">
 		RewriteCond %{HTTP_HOST} <tmpl_var name='alias_seo_redirect_operator'>^<tmpl_var name='alias_seo_redirect_origin_domain'>$ [NC]
 		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
 		RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
 		</tmpl_if>
-		RewriteRule ^(.*)$ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>$1 [R=301,NE,L]
+		RewriteRule ^ http<tmpl_if name='ssl_enabled'>s</tmpl_if>://<tmpl_var name='alias_seo_redirect_target_domain'>%{REQUEST_URI} [R=301,NE,L]
 </tmpl_loop>
 <tmpl_loop name="redirects">
-		RewriteCond %{HTTP_HOST}   <tmpl_var name='rewrite_domain'>$ [NC]
+		RewriteCond %{HTTP_HOST} <tmpl_var name='rewrite_domain'>$ [NC]
 		<tmpl_if name='apache_version' op='<' value='2.4' format='version'>
 		RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
 		</tmpl_if>
@@ -462,8 +462,7 @@
 		RewriteCond %{REQUEST_URI} !^/php5-fcgi/
 		RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
 </tmpl_if>
-		
-		RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if>  <tmpl_var name='rewrite_type'>
+		RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if> <tmpl_var name='rewrite_type'>
 	
 </tmpl_loop>
 <tmpl_if name='ssl_enabled'>
-- 
GitLab


From 97657c77bfc6f5329d504ffe934f9d2827caf686 Mon Sep 17 00:00:00 2001
From: Oliver <contact@ncomputers.org>
Date: Wed, 22 Mar 2017 09:04:29 +0100
Subject: [PATCH 2/2] Update vhost.conf.master

---
 server/conf/vhost.conf.master | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 8705db7ebe..6c2f0b3122 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -462,7 +462,7 @@
 		RewriteCond %{REQUEST_URI} !^/php5-fcgi/
 		RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
 </tmpl_if>
-		RewriteRule ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if> <tmpl_var name='rewrite_type'>
+		RewriteRule /(.*) <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if> <tmpl_var name='rewrite_type'>
 	
 </tmpl_loop>
 <tmpl_if name='ssl_enabled'>
-- 
GitLab