summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2009-06-27 16:24:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-27 20:15:57 (GMT)
commit1bed73c64a354248d6b342e58df257e8233bcbd2 (patch)
tree037dc2b3db7a91dba9dc79a1a6aa0a6cfbd1d054
parent0f7050469b7ae9a95ab01880ecd5cf22e6e41dd2 (diff)
downloadgit-1bed73c64a354248d6b342e58df257e8233bcbd2.zip
git-1bed73c64a354248d6b342e58df257e8233bcbd2.tar.gz
git-1bed73c64a354248d6b342e58df257e8233bcbd2.tar.bz2
gitweb/README: fix AliasMatch in example
When combining "dumb client" and human-friendly access by using the '.git' extension to switch between the two, make sure the AliasMatch covers the entire request. Without a full match, a request for http://git.example.com/project/shortlog/branch..gitsomething would result in a 404 because the server would try to access the the project 'project/shortlog/branch.' The solution is still not bulletproof, so document the possible failing case. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--gitweb/README10
1 files changed, 9 insertions, 1 deletions
diff --git a/gitweb/README b/gitweb/README
index ccda890..9056d1e 100644
--- a/gitweb/README
+++ b/gitweb/README
@@ -377,7 +377,7 @@ named without a .git extension (e.g. /pub/git/project instead of
DocumentRoot /var/www/gitweb
- AliasMatch ^(/.*?)(\.git)(/.*)? /pub/git$1$3
+ AliasMatch ^(/.*?)(\.git)(/.*)?$ /pub/git$1$3
<Directory /var/www/gitweb>
Options ExecCGI
AddHandler cgi-script cgi
@@ -402,6 +402,14 @@ http://git.example.com/project
will provide human-friendly gitweb access.
+This solution is not 100% bulletproof, in the sense that if some project
+has a named ref (branch, tag) starting with 'git/', then paths such as
+
+http://git.example.com/project/command/abranch..git/abranch
+
+will fail with a 404 error.
+
+
Originally written by:
Kay Sievers <kay.sievers@vrfy.org>