Merging upstream version 1.46.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 104 deletions

diff --git a/web/server/h2o/libh2o/t/50reverse-proxy-config.t b/web/server/h2o/libh2o/t/50reverse-proxy-config.t
deleted file mode 100644
index 62b34668a..000000000
--- a/web/server/h2o/libh2o/t/50reverse-proxy-config.t
+++ /dev/null
@@ -1,104 +0,0 @@
-use strict;
-use warnings;
-use Digest::MD5 qw(md5_hex);
-use Net::EmptyPort qw(check_port empty_port);
-use Test::More;
-use t::Util;
-
-plan skip_all => 'plackup not found'
-    unless prog_exists('plackup');
-
-plan skip_all => 'Starlet not found'
-    unless system('perl -MStarlet /dev/null > /dev/null 2>&1') == 0;
-
-plan skip_all => 'curl not found'
-    unless prog_exists('curl');
-
-# start upstream
-my $upstream_port = empty_port();
-my $upstream = spawn_server(
-    argv     => [
-        qw(plackup -MPlack::App::File -s Starlet --access-log /dev/null -p), $upstream_port,
-        ASSETS_DIR . "/upstream.psgi",
-    ],
-    is_ready =>  sub {
-        check_port($upstream_port);
-    },
-);
-
-subtest 'preserve-host' => sub {
-    my $doit = sub {
-        my $flag = shift;
-        my $server = spawn_h2o(<< "EOT");
-hosts:
-  default:
-    paths:
-      /:
-        proxy.reverse.url: http://127.0.0.1:$upstream_port
-        proxy.preserve-host: @{[ $flag ? 'ON' : 'OFF' ]}
-EOT
-        my $res = `curl --silent http://127.0.0.1:$server->{port}/echo-headers`;
-        like $res, qr/^host: 127.0.0.1:@{[ $flag ? $server->{port} : $upstream_port ]}$/im, 'host header';
-
-        $res = `curl --silent --dump-header /dev/stdout "http://127.0.0.1:$server->{port}/?resp:status=302&resp:location=http://127.0.0.1:$server->{port}/foo"`;
-        like $res, qr{^location: http://127\.0\.0\.1:$server->{port}/foo}im, 'location: :server_port';
-        warn qq{curl --silent --dump-header /dev/stdout "http://127.0.0.1:$server->{port}/?resp:status=302&resp:location=http://127.0.0.1:$upstream_port/foo"};
-        $res = `curl --silent --dump-header /dev/stdout "http://127.0.0.1:$server->{port}/?resp:status=302&resp:location=http://127.0.0.1:$upstream_port/foo"`;
-        like $res, qr{^location: http://127\.0\.0\.1:$server->{port}/foo}im, 'location :upstream_port';
-    };
-
-    subtest 'ON' => sub {
-        $doit->(1);
-    };
-    subtest 'OFF' => sub {
-        $doit->(0);
-    };
-};
-
-subtest 'timeout.io' => sub {
-    my $server = spawn_h2o(<< "EOT");
-hosts:
-  default:
-    paths:
-      /:
-        proxy.reverse.url: http://127.0.0.1:$upstream_port
-        proxy.timeout.io: 2000
-EOT
-    my $fetch = sub {
-        my $sleep = shift;
-        `curl --silent --dump-header /dev/stderr http://127.0.0.1:$server->{port}/sleep-and-respond?sleep=$sleep 2>&1 > /dev/null`;
-    };
-    my $resp = $fetch->(1);
-    like $resp, qr{^HTTP/1\.1 200 }s, "respond before timeout";
-    $resp = $fetch->(3);
-    like $resp, qr{^HTTP/1\.1 502 }s, "respond after timeout";
-};
-
-subtest 'infinite-internal-redirect' => sub {
-    my $server = spawn_h2o(<< "EOT");
-hosts:
-  default:
-    paths:
-      /:
-        proxy.reverse.url: http://127.0.0.1:$upstream_port
-reproxy: ON
-EOT
-    my $resp = `curl --silent --dump-header /dev/stderr "http://127.0.0.1:$server->{port}/?resp:x-reproxy-url=http://127.0.0.1:$upstream_port/infinite-redirect" 2>&1 > /dev/null`;
-    like $resp, qr{^HTTP/1\.1 502 }s;
-};
-
-subtest 'max-delegations' => sub {
-    my $server = spawn_h2o(<< "EOT");
-hosts:
-  default:
-    paths:
-      /:
-        proxy.reverse.url: http://127.0.0.1:$upstream_port
-reproxy: ON
-max-delegations: 0
-EOT
-    my $resp = `curl --silent --dump-header /dev/stderr "http://127.0.0.1:$server->{port}/?resp:x-reproxy-url=http://127.0.0.1:$upstream_port/index.txt" 2>&1 > /dev/null`;
-    like $resp, qr{^HTTP/1\.1 502 }s;
-};
-
-done_testing;