From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Nov 2010 00:00:34 +0000 (-0800)
Subject: Merge branch 'gc/http-with-non-ascii-username-url' into next
X-Git-Tag: ko-next~122
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=08f317f3a93b9c4009441460dbdc075c2ec5e076;p=git.git

Merge branch 'gc/http-with-non-ascii-username-url' into next

* gc/http-with-non-ascii-username-url:
  Fix username and password extraction from HTTP URLs
  t5550: test HTTP authentication and userinfo decoding

Conflicts:
	t/lib-httpd/apache.conf
---

08f317f3a93b9c4009441460dbdc075c2ec5e076
diff --cc t/lib-httpd/apache.conf
index f41c7c674,b40e43bb3..0a4cdfa93
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@@ -17,11 -17,30 +17,33 @@@ ErrorLog error.lo
  <IfModule !mod_env.c>
  	LoadModule env_module modules/mod_env.so
  </IfModule>
 +<IfModule !mod_rewrite.c>
 +	LoadModule rewrite_module modules/mod_rewrite.so
 +</IFModule>
+ <IfModule !mod_version.c>
+ 	LoadModule version_module modules/mod_version.so
+ </IfModule>
+ 
+ <IfVersion < 2.1>
+ <IfModule !mod_auth.c>
+ 	LoadModule auth_module modules/mod_auth.so
+ </IfModule>
+ </IfVersion>
+ 
+ <IfVersion >= 2.1>
+ <IfModule !mod_auth_basic.c>
+ 	LoadModule auth_basic_module modules/mod_auth_basic.so
+ </IfModule>
+ <IfModule !mod_authn_file.c>
+ 	LoadModule authn_file_module modules/mod_authn_file.so
+ </IfModule>
+ <IfModule !mod_authz_user.c>
+ 	LoadModule authz_user_module modules/mod_authz_user.so
+ </IfModule>
+ </IfVersion>
  
  Alias /dumb/ www/
+ Alias /auth/ www/auth/
  
  <Location /smart/>
  	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}