From 201858a208e9597f798e55eeaca396f00ef087e9 Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Wed, 30 Mar 2016 23:46:30 -0700
Subject: [PATCH] apache.conf.in: optimize a few test patterns

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
---
 apache.conf.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apache.conf.in b/apache.conf.in
index 7bdf8ad..04dc088 100644
--- a/apache.conf.in
+++ b/apache.conf.in
@@ -52,7 +52,7 @@
 
 		# Snapshot requests are only allowed via the PATH_INFO mechanism
 		RewriteCond %{QUERY_STRING}	(^|[&;])a=snapshot([&;]|$) [NC]
-		RewriteRule .* - [NS,F,L]
+		RewriteRule .? - [NS,F,L]
 
 		# Redirect snapshot requests to snapshot.cgi
 		RewriteRule \
@@ -62,13 +62,13 @@
 		# Make the leading /h optional for requests that name an existing .html template
 		RewriteCond @@webroot@@/$1 !-f
 		RewriteCond @@cgiroot@@/$1 !-f
-		RewriteCond @@basedir@@/html/$1 -f
+		RewriteCond @@basedir@@/html/$1 -s
 		RewriteRule \
 			^/(?![bchrw]/)(.*\.html)$ \
 			/h/$1 [NS,PT]
 
 		# Redirect bare /w requests without .git that name an existing repo...
-		RewriteCond @@reporoot@@/$1.git/HEAD -f
+		RewriteCond @@reporoot@@/$1.git/HEAD -s
 		RewriteRule \
 			^/w/((?:[a-zA-Z0-9+._-]+(?<!\.git)/)*[a-zA-Z0-9+._-]+(?<!\.git))/?$ \
 			/w/$1.git [NS,L,R=301]
@@ -77,7 +77,7 @@
 		RewriteCond @@webroot@@/$1 !-f
 		RewriteCond @@cgiroot@@/$1 !-f
 		RewriteCond %{HTTP_USER_AGENT} !git/ [NC]
-		RewriteCond @@reporoot@@/$1.git/HEAD -f
+		RewriteCond @@reporoot@@/$1.git/HEAD -s
 		RewriteRule \
 			^/(?![bchrw]/)((?:[a-zA-Z0-9+._-]+(?<!\.git)/)*[a-zA-Z0-9+._-]+(?<!\.git))/?$ \
 			/$1.git [NS,L,R=301]
@@ -87,7 +87,7 @@
 		RewriteCond @@webroot@@/$1$2 !-f
 		RewriteCond @@cgiroot@@/$1$2 !-f
 		RewriteCond %{HTTP_USER_AGENT} !git/ [NC]
-		RewriteCond @@reporoot@@/$1/HEAD -f
+		RewriteCond @@reporoot@@/$1/HEAD -s
 		# Might want to use [NS,L,R] instead of [NS,PT] maybe even [NS,L,R=301]
 		RewriteRule \
 			^/(?![bchrw]/)((?:[a-zA-Z0-9+._-]+(?<!\.git)/)*[a-zA-Z0-9+._-]+?\.git)(?!/(?:bundles|[a-zA-Z0-9+._-]+\.bundle)$)((?:/.*)?)$ \
@@ -98,7 +98,7 @@
 		RewriteCond @@webroot@@/$1 !-f
 		RewriteCond @@cgiroot@@/$1 !-f
 		RewriteCond %{HTTP_USER_AGENT} !git/ [NC]
-		RewriteCond @@reporoot@@/$1/HEAD -f
+		RewriteCond @@reporoot@@/$1/HEAD -s
 		# Might want to use [NS,L,R] instead of [NS,PT] maybe even [NS,L,R=301]
 		RewriteRule \
 			^/(?![bchrw]/)((?:[a-zA-Z0-9+._-]+(?<!\.git)/)*[a-zA-Z0-9+._-]+?\.git)/bundles$ \
@@ -294,7 +294,7 @@
 			# ...and finally this for access by all agents to
 			# *.bundle files without the /r/ prefix for names not
 			# ending in .git as long as the repository exists
-			RewriteCond @@reporoot@@$1.git/HEAD -f
+			RewriteCond @@reporoot@@$1.git/HEAD -s
 			RewriteRule \
 				^(?!/[bchrw]/)((?:/[a-zA-Z0-9+._-]+(?<!\.git))+)(/[a-zA-Z0-9+._-]+\.bundle)$ \
 				@@basedir@@/bin/git-http-backend-verify$1$2 \
-- 
2.11.4.GIT