Merge branch 'gc/http-with-non-ascii-username-url'
commit16c06fcb39eec5505c383b412ca2254bccf354a5
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:14 +0000 (8 11:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:14 +0000 (8 11:24 -0800)
tree8309090ba4e62e14766621ababaed91def3cba3d
parent09a8fbd59cb18c222db732e053c17583f7f06840
parentf39f72d8cf03b61407f64460eba3357ec532280e
Merge branch 'gc/http-with-non-ascii-username-url'

* 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
http.c
t/lib-httpd/apache.conf