diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:28:26 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:28:31 -0700 |
commit | 6343e2f6f271cf344ea8e7384342502faecaf37c (patch) | |
tree | 50abed20e4b930022a24b64389915f7c774acef9 /t/lib-httpd/apache.conf | |
parent | 74b67638166ca2e66497ede559dbf393e7af8b40 (diff) | |
parent | 18b58f707fdb3ad7d3d4931bd40693834c9ec8a0 (diff) | |
download | git-6343e2f6f271cf344ea8e7384342502faecaf37c.tar.gz |
Sync with 2.3.10
Diffstat (limited to 't/lib-httpd/apache.conf')
-rw-r--r-- | t/lib-httpd/apache.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index 0b81a0047b..7d15e6d44c 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -119,6 +119,10 @@ RewriteRule ^/smart-redir-perm/(.*)$ /smart/$1 [R=301] RewriteRule ^/smart-redir-temp/(.*)$ /smart/$1 [R=302] RewriteRule ^/smart-redir-auth/(.*)$ /auth/smart/$1 [R=301] RewriteRule ^/smart-redir-limited/(.*)/info/refs$ /smart/$1/info/refs [R=301] +RewriteRule ^/ftp-redir/(.*)$ ftp://localhost:1000/$1 [R=302] + +RewriteRule ^/loop-redir/x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-x-(.*) /$1 [R=302] +RewriteRule ^/loop-redir/(.*)$ /loop-redir/x-$1 [R=302] <IfDefine SSL> LoadModule ssl_module modules/mod_ssl.so |