[PATCH 4 of 5] Tests: removed remnants of "listen ... http2" usage
Maxim Dounin
mdounin at mdounin.ru
Fri Aug 9 20:37:28 UTC 2024
# HG changeset patch
# User Maxim Dounin <mdounin at mdounin.ru>
# Date 1723170064 -10800
# Fri Aug 09 05:21:04 2024 +0300
# Node ID 6b3b31149551efb88fa863901563932c19679db2
# Parent d2d00eea7b3d5bcc39b52df2293481a073156a37
Tests: removed remnants of "listen ... http2" usage.
The only remaining test which uses "listen ... http2" is h2_http2.t
now, which is specifically to test that this form still works.
diff --git a/h2_ssl.t b/h2_ssl.t
--- a/h2_ssl.t
+++ b/h2_ssl.t
@@ -41,9 +41,11 @@ http {
%%TEST_GLOBALS_HTTP%%
server {
- listen 127.0.0.1:8080 http2 ssl;
+ listen 127.0.0.1:8080 ssl;
server_name localhost;
+ http2 on;
+
ssl_certificate_key localhost.key;
ssl_certificate localhost.crt;
@@ -77,9 +79,7 @@ foreach my $name ('localhost') {
$t->write_file('tbig.html',
join('', map { sprintf "XX%06dXX", $_ } (1 .. 500000)));
-open OLDERR, ">&", \*STDERR; close STDERR;
$t->run();
-open STDERR, ">&", \*OLDERR;
plan(skip_all => 'no ALPN negotiation') unless defined getconn();
$t->plan(4);
diff --git a/h2_ssl_proxy_cache.t b/h2_ssl_proxy_cache.t
--- a/h2_ssl_proxy_cache.t
+++ b/h2_ssl_proxy_cache.t
@@ -42,9 +42,11 @@ http {
proxy_cache_path %%TESTDIR%%/cache keys_zone=NAME:1m;
server {
- listen 127.0.0.1:8080 http2 ssl sndbuf=32k;
+ listen 127.0.0.1:8080 ssl sndbuf=32k;
server_name localhost;
+ http2 on;
+
ssl_certificate_key localhost.key;
ssl_certificate localhost.crt;
@@ -88,9 +90,7 @@ foreach my $name ('localhost') {
$t->write_file('tbig.html',
join('', map { sprintf "XX%06dXX", $_ } (1 .. 500000)));
-open OLDERR, ">&", \*STDERR; close STDERR;
$t->run();
-open STDERR, ">&", \*OLDERR;
plan(skip_all => 'no ALPN negotiation') unless defined getconn(port(8080));
$t->plan(1);
diff --git a/h2_ssl_proxy_protocol.t b/h2_ssl_proxy_protocol.t
--- a/h2_ssl_proxy_protocol.t
+++ b/h2_ssl_proxy_protocol.t
@@ -42,9 +42,11 @@ http {
%%TEST_GLOBALS_HTTP%%
server {
- listen 127.0.0.1:8080 proxy_protocol http2 ssl;
+ listen 127.0.0.1:8080 proxy_protocol ssl;
server_name localhost;
+ http2 on;
+
ssl_certificate_key localhost.key;
ssl_certificate localhost.crt;
@@ -79,9 +81,7 @@ foreach my $name ('localhost') {
$t->write_file('t.html', 'SEE-THIS');
-open OLDERR, ">&", \*STDERR; close STDERR;
$t->run();
-open STDERR, ">&", \*OLDERR;
###############################################################################
diff --git a/h2_ssl_variables.t b/h2_ssl_variables.t
--- a/h2_ssl_variables.t
+++ b/h2_ssl_variables.t
@@ -39,9 +39,11 @@ http {
%%TEST_GLOBALS_HTTP%%
server {
- listen 127.0.0.1:8080 http2 ssl;
+ listen 127.0.0.1:8080 ssl;
server_name localhost;
+ http2 on;
+
ssl_certificate_key localhost.key;
ssl_certificate localhost.crt;
@@ -80,9 +82,7 @@ foreach my $name ('localhost') {
or die "Can't create certificate for $name: $!\n";
}
-open OLDERR, ">&", \*STDERR; close STDERR;
$t->run();
-open STDERR, ">&", \*OLDERR;
###############################################################################
More information about the nginx-devel
mailing list