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

* 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

diff --cc http.c
Simple merge

diff --cc t/lib-httpd/apache.conf
index f41c7c674c497825d714a0fe9be3c9bc0a0f30c6,b40e43bb311dd6f5088c0eb2ea8d1e67214f130f..0a4cdfa93ece7d8a4177835b5569583c22303564
--- 1/t/lib-httpd/apache.conf
--- 2/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}