Merge branch 'faster_redirects' into 'master'

RewriteRule ^ %{REQUEST_URI} is faster than ^(.*)$ $1



See merge request !562

Author: Till Brehm

server/conf/vhost.conf.master

@@ -452,17 +452,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>
@@ -471,8 +471,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>