diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-08 11:24:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-08 11:24:14 -0800 |
| commit | 16c06fcb39eec5505c383b412ca2254bccf354a5 (patch) | |
| tree | 8309090ba4e62e14766621ababaed91def3cba3d /t/lib-httpd | |
| parent | 09a8fbd59cb18c222db732e053c17583f7f06840 (diff) | |
| parent | f39f72d8cf03b61407f64460eba3357ec532280e (diff) | |
| download | git-16c06fcb39eec5505c383b412ca2254bccf354a5.tar.gz git-16c06fcb39eec5505c383b412ca2254bccf354a5.tar.xz | |
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
Diffstat (limited to 't/lib-httpd')
| -rw-r--r-- | t/lib-httpd/apache.conf | 29 | ||||
| -rw-r--r-- | t/lib-httpd/passwd | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index f41c7c674..0a4cdfa93 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -20,8 +20,30 @@ ErrorLog error.log <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} @@ -55,6 +77,13 @@ SSLMutex file:ssl_mutex SSLEngine On </IfDefine> +<Location /auth/> + AuthType Basic + AuthName "git-auth" + AuthUserFile passwd + Require valid-user +</Location> + <IfDefine DAV> LoadModule dav_module modules/mod_dav.so LoadModule dav_fs_module modules/mod_dav_fs.so diff --git a/t/lib-httpd/passwd b/t/lib-httpd/passwd new file mode 100644 index 000000000..f2fbcad33 --- /dev/null +++ b/t/lib-httpd/passwd @@ -0,0 +1 @@ +user@host:nKpa8pZUHx/ic |