From b5f8ee61a7f7e9bd291dd26b0585d03eb686c941 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 5 May 2024 13:19:16 +0200
Subject: Adding upstream version 1.46.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 web/server/h2o/libh2o/t/40websocket.t | 114 ----------------------------------
 1 file changed, 114 deletions(-)
 delete mode 100644 web/server/h2o/libh2o/t/40websocket.t

(limited to 'web/server/h2o/libh2o/t/40websocket.t')

diff --git a/web/server/h2o/libh2o/t/40websocket.t b/web/server/h2o/libh2o/t/40websocket.t
deleted file mode 100644
index a321c034a..000000000
--- a/web/server/h2o/libh2o/t/40websocket.t
+++ /dev/null
@@ -1,114 +0,0 @@
-use strict;
-use warnings;
-use IO::Socket::INET;
-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;
-
-# spawn upstream
-my $upstream_port = empty_port();
-my $upstream = spawn_server(
-    argv     => [
-        qw(plackup -s Starlet --access-log /dev/null -p), $upstream_port, ASSETS_DIR . "/upstream.psgi",
-    ],
-    is_ready => sub {
-        check_port($upstream_port);
-    },
-);
-
-sub silent_server {
-    return spawn_h2o(<< "EOT");
-hosts:
-  default:
-    paths:
-      /:
-        proxy.reverse.url: http://127.0.0.1:$upstream_port/
-        proxy.websocket: ON
-        proxy.websocket.timeout: 1000
-EOT
-}
-
-subtest "http/1.1" => sub {
-    my $server = silent_server();
-    plan skip_all => "curl not found"
-        unless prog_exists("curl");
-    my $resp = `curl --silent --insecure 'http://127.0.0.1:$server->{port}/index.txt'`;
-    is $resp, "hello\n";
-};
-
-sub doit {
-    my $conn = shift;
-    my $req = join(
-        "\r\n",
-        "GET /websocket/ HTTP/1.1",
-        "Connection: upgrade",
-        "Upgrade: websocket",
-        "Sec-Websocket-Key: abcde",
-        "Sec-Websocket-Version: 13",
-        "",
-        "",
-    );
-    is $conn->syswrite($req), length($req), "send request";
-    $conn->sysread(my $rbuf, 65536) > 0
-        or die "failed to read HTTP response";
-    like $rbuf, qr{^HTTP\/1\.1 101 }is;
-    like $rbuf, qr{\r\n\r\n$}is;
-    like $rbuf, qr{\r\nupgrade: websocket\r\n}is;
-    unlike $rbuf, qr{\r\nupgrade:.*\r\nupgrade:}is;
-    like $rbuf, qr{\r\nsec-websocket-accept: .*\r\n}is;
-    for my $i (1..10) {
-        my $msg = "hello world $i\n";
-        is $conn->syswrite($msg), length($msg), "write text ($i)";
-        is $conn->sysread($rbuf, 65536), length($msg), "read echo ($i)";
-        is $rbuf, $msg, "echo is correct ($i)";
-    }
-    $conn->close;
-}
-
-subtest "ws" => sub {
-    my $server = silent_server();
-    my $conn = IO::Socket::INET->new(
-        PeerHost => '127.0.0.1',
-        PeerPort => $server->{port},
-        Proto    => 'tcp',
-    ) or die "failed to connect to 127.0.0.1:$server->{port}:$!";
-    doit($conn);
-};
-
-subtest "wss" => sub {
-    my $server = silent_server();
-    eval q{use IO::Socket::SSL; 1}
-        or plan skip_all => "IO::Socket::SSL not found";
-    my $conn = IO::Socket::SSL->new(
-        PeerAddr        => "127.0.0.1:$server->{tls_port}",
-        SSL_verify_mode => 0,
-    ) or die "failed to connect via TLS to 127.0.0.1:$server->{tls_port}:". IO::Socket::SSL::errstr();
-    doit($conn);
-};
-
-subtest "logged-ws" => sub {
-    my $server = spawn_h2o(<< "EOT");
-hosts:
-  default:
-    paths:
-      /:
-        proxy.reverse.url: http://127.0.0.1:$upstream_port/
-        proxy.websocket: ON
-        proxy.websocket.timeout: 1000
-access-log: /dev/null # enable logging
-EOT
-
-    my $conn = IO::Socket::INET->new(
-        PeerHost => '127.0.0.1',
-        PeerPort => $server->{port},
-        Proto    => 'tcp',
-    ) or die "failed to connect to 127.0.0.1:$server->{port}:$!";
-    doit($conn);
-};
-
-done_testing;
-- 
cgit v1.2.3