From ea5f7a3135848fc5009659ff1448b70183a26117 Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Thu, 10 Jul 2014 18:13:23 -0700
Subject: [PATCH] apache.conf: make the trailing .git on bare gitweb URLs
 optional

Since the trailing .git is already optional on URLs used with the
Git client, make it optional for GitWeb as well, but only for
the base repository browser (i.e. the bare summary link).

Make these permanent redirects because we require the '.git' portion
in the URL path for correct processing of other GitWeb activity.
---
 apache.conf.in | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/apache.conf.in b/apache.conf.in
index c3a7204..ec3c837 100644
--- a/apache.conf.in
+++ b/apache.conf.in
@@ -31,14 +31,27 @@
 	ScriptAlias /h @@cgiroot@@/html.cgi
 
 	<IfModule rewrite_module>
-		# Make the leading /w optional if the rest names an existing repo
 		RewriteEngine On
+		# Redirect bare /w requests without .git that name an existing repo...
+		RewriteCond @@reporoot@@/$1.git/HEAD -f
+		RewriteRule \
+			^/w/((?:[a-zA-Z0-9+._-]+(?<!\.git)/)*[a-zA-Z0-9+._-]+(?<!\.git))/?$ \
+			/w/$1.git [L,R=301]
+
+		# ...and also make the leading /w optional for those types of requests
+		RewriteCond %{HTTP_USER_AGENT} !git/ [NC]
+		RewriteCond @@reporoot@@/$1.git/HEAD -f
+		RewriteRule \
+			^/(?!w/)((?:[a-zA-Z0-9+._-]+(?<!\.git)/)*[a-zA-Z0-9+._-]+(?<!\.git))/?$ \
+			/$1.git [L,R=301]
+
+		# Make the leading /w optional if the rest names an existing repo
 		RewriteCond %{HTTP_USER_AGENT} !git/ [NC]
 		RewriteCond @@reporoot@@/$1/HEAD -f
-		# Might want to use [NC,L,R] instead of [NC,PT] maybe even [NC,L,R=301]
+		# Might want to use [L,R] instead of [PT] maybe even [L,R=301]
 		RewriteRule \
-			^/(?!w/)((?:[a-z0-9+._-]+(?<!\.git)/)*[a-z0-9+._-]+?\.git)((?:/.*)?)$ \
-			/w/$1$2 [NC,PT]
+			^/(?!w/)((?:[a-zA-Z0-9+._-]+(?<!\.git)/)*[a-zA-Z0-9+._-]+?\.git)((?:/.*)?)$ \
+			/w/$1$2 [PT]
 	</IfModule>
 
 	<Directory @@reporoot@@>
-- 
2.11.4.GIT