diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-14 07:35:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 07:35:18 -0800 |
| commit | 187b259dce5c5db17ef4cac09b163753e85e62cc (patch) | |
| tree | 84e0f571b0754e84bf7f6dccf5e2c2966e163421 /t/lib-httpd.sh | |
| parent | c6d059bbccb8460959b9aedfeefbb4d6aac6e842 (diff) | |
| parent | f39f72d8cf03b61407f64460eba3357ec532280e (diff) | |
| download | git-187b259dce5c5db17ef4cac09b163753e85e62cc.tar.gz git-187b259dce5c5db17ef4cac09b163753e85e62cc.tar.xz | |
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
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index e733f6516..3f2438437 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -75,12 +75,14 @@ fi prepare_httpd() { mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH" + cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH" ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules" if test -n "$LIB_HTTPD_SSL" then HTTPD_URL=https://127.0.0.1:$LIB_HTTPD_PORT + AUTH_HTTPD_URL=https://user%40host:user%40host@127.0.0.1:$LIB_HTTPD_PORT RANDFILE_PATH="$HTTPD_ROOT_PATH"/.rnd openssl req \ -config "$TEST_PATH/ssl.cnf" \ @@ -92,6 +94,7 @@ prepare_httpd() { HTTPD_PARA="$HTTPD_PARA -DSSL" else HTTPD_URL=http://127.0.0.1:$LIB_HTTPD_PORT + AUTH_HTTPD_URL=http://user%40host:user%40host@127.0.0.1:$LIB_HTTPD_PORT fi if test -n "$LIB_HTTPD_DAV" -o -n "$LIB_HTTPD_SVN" |