Merging upstream version 1.46.3.

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

1 files changed, 0 insertions, 35 deletions

diff --git a/web/server/h2o/libh2o/t/50reverse-proxy-upstream-down.t b/web/server/h2o/libh2o/t/50reverse-proxy-upstream-down.t
deleted file mode 100644
index 3f30a4471..000000000
--- a/web/server/h2o/libh2o/t/50reverse-proxy-upstream-down.t
+++ /dev/null
@@ -1,35 +0,0 @@
-use strict;
-use warnings;
-use Net::EmptyPort qw(check_port empty_port);
-use Test::More;
-use t::Util;
-
-plan skip_all => 'curl not found'
-    unless prog_exists('curl');
-
-sub doit {
-    my $persistent = shift;
-    my $upstream_port = empty_port();
-    my $server = spawn_h2o(<< "EOT");
-hosts:
-  default:
-    paths:
-      /:
-        proxy.reverse.url: http://127.0.0.1:$upstream_port
-        proxy.timeout.io: 2000
-@{[ $persistent ? "" : "proxy.timeout.keepalive: 0" ]}
-EOT
-    my $port = $server->{port};
-    my $res = `curl --max-time 5 --silent --dump-header /dev/stderr http://127.0.0.1:$port/ 2>&1 > /dev/null`;
-    like $res, qr{^HTTP/1\.1 502 }, "502 response on upstream error";
-};
-
-subtest 'non-persistent' => sub {
-    doit(0);
-};
-
-subtest 'persistent' => sub {
-    doit(1);
-};
-
-done_testing();