aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-08-27 09:24:42 -0400
committerJunio C Hamano <gitster@pobox.com>2012-08-27 10:49:08 -0700
commit05b577107dda131d46f93aa9bb7817c80bc30ee9 (patch)
treea8cc42c56d8d976488de94cf214caa1dc078db3f
parente837936c7c08ac5829bc53761ecb57d18d458edd (diff)
downloadgit-05b577107dda131d46f93aa9bb7817c80bc30ee9.tar.gz
git-05b577107dda131d46f93aa9bb7817c80bc30ee9.tar.xz
t/lib-httpd: only route auth/dumb to dumb repos
Our test apache config points all of auth/ directly to the on-disk repositories via an Alias directive. This works fine because everything authenticated is currently in auth/dumb, which is a subset. However, this would conflict with a ScriptAlias for auth/smart (which will come in future patches), so let's narrow the Alias. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/lib-httpd/apache.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index de3762e24..b183e3513 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -43,7 +43,7 @@ ErrorLog error.log
</IfVersion>
Alias /dumb/ www/
-Alias /auth/ www/auth/
+Alias /auth/dumb/ www/auth/dumb/
<Location /smart/>
SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}