diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-28 14:46:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 14:46:05 -0700 |
| commit | f2df3104ce45bc1ee6d7c16f3a02f1d157c65e07 (patch) | |
| tree | 0fab49f2d65cee265a23f3b95e84c57a0e38430f /t/lib-httpd | |
| parent | Merge branch 'jk/transfer-limit-protocol' into maint-2.3 (diff) | |
| parent | http: limit redirection depth (diff) | |
| download | tgif-f2df3104ce45bc1ee6d7c16f3a02f1d157c65e07.tar.xz | |
Merge branch 'jk/transfer-limit-redirection' into maint-2.3
Diffstat (limited to 't/lib-httpd')
| -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 |