Merging upstream version 1.44.3.

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

1 files changed, 66 insertions, 0 deletions

diff --git a/web/server/h2o/libh2o/t/40server-push-multiple.t b/web/server/h2o/libh2o/t/40server-push-multiple.t
new file mode 100644
index 000000000..b43c9675f
--- /dev/null
+++ b/web/server/h2o/libh2o/t/40server-push-multiple.t
@@ -0,0 +1,66 @@
+use strict;
+use warnings;
+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 => 'nghttp not found'
+    unless prog_exists('nghttp');
+plan skip_all => 'mruby support is off'
+    unless server_features()->{mruby};
+
+subtest "basic" => sub {
+    # 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);
+        },
+    );
+    # spawn server
+    my $server = spawn_h2o(<< "EOT");
+hosts:
+  default:
+    paths:
+      /:
+        proxy.reverse.url: http://127.0.0.1:$upstream_port
+      /mruby:
+        mruby.handler: |
+          Proc.new do |env|
+            [399, { "link" => "</index.txt.gz>; rel=preload, </index.txt.gz?1>; rel=preload, </index.txt.gz?nopush>; rel=preload; nopush" }, [] ]
+          end
+        proxy.reverse.url: http://127.0.0.1:$upstream_port
+      /assets:
+        file.dir: @{[DOC_ROOT]}
+EOT
+
+    my $doit = sub {
+        my ($proto, $opts, $port) = @_;
+        subtest 'push-prioritized' => sub {
+            my $resp = `nghttp $opts -n --stat '$proto://127.0.0.1:$port/mruby'`;
+            like $resp, qr{\nid\s*responseEnd\s.*\s/index\.txt\.gz}is, "index.txt.gz is pushed";
+            like $resp, qr{\nid\s*responseEnd\s.*\s/index\.txt\.gz\?1}is, "index.txt.gz?1 is pushed";
+            unlike $resp, qr{\nid\s*responseEnd\s.*\s/index\.txt\.gz\?nopush}is, "index.txt.gz?nopush isn't pushed";
+        };
+    };
+
+    subtest 'h2 direct' => sub {
+        $doit->('http', '', $server->{port});
+    };
+    subtest 'h2 upgrade' => sub {
+        $doit->('http', '-u', $server->{port});
+    };
+    subtest 'h2c' => sub {
+        $doit->('https', '', $server->{tls_port});
+    };
+};
+
+
+done_testing;