# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1679140616 -10800
# Sat Mar 18 14:56:56 2023 +0300
# Node ID 8d33ee433f58be6100fb084a12ae8c569259666a
# Parent 01721a51ba94e022d1f59485b9da490683ac0c2f
Tests: restored proper port numbers in ssl_sni_sessions.t.

While using port 8080 for SSL connection works, it's usually a bad idea,
since 8080 implies plain HTTP, much like 80. For HTTPS we generally use
port 8443 instead.

Unfortunately, proper port numbers were lost in 952:e9064d691790 and
974:882267679006, while converting tests to run in parallel.

diff --git a/ssl_sni_sessions.t b/ssl_sni_sessions.t
--- a/ssl_sni_sessions.t
+++ b/ssl_sni_sessions.t
@@ -39,7 +39,7 @@ http {
ssl_certificate localhost.crt;

server {
- listen 127.0.0.1:8080 ssl;
+ listen 127.0.0.1:8443 ssl;
server_name default;

ssl_session_tickets off;
@@ -51,7 +51,7 @@ http {
}

server {
- listen 127.0.0.1:8080;
+ listen 127.0.0.1:8443;
server_name nocache;

ssl_session_tickets off;
@@ -63,7 +63,7 @@ http {
}

server {
- listen 127.0.0.1:8081 ssl;
+ listen 127.0.0.1:8444 ssl;
server_name default;

ssl_session_ticket_key ticket1.key;
@@ -74,7 +74,7 @@ http {
}

server {
- listen 127.0.0.1:8081;
+ listen 127.0.0.1:8444;
server_name tickets;

ssl_session_ticket_key ticket2.key;
@@ -128,7 +128,7 @@ foreach my $name ('localhost') {
$t->run();

plan(skip_all => 'no TLS 1.3 sessions')
- if get('default', port(8080), get_ssl_context()) =~ /TLSv1.3/
+ if get('default', port(8443), get_ssl_context()) =~ /TLSv1.3/
&& ($Net::SSLeay::VERSION < 1.88 || $IO::Socket::SSL::VERSION < 2.061);

$t->plan(6);
@@ -139,8 +139,8 @@ plan(skip_all => 'no TLS 1.3 sessions')

my $ctx = get_ssl_context();

-like(get('default', port(8080), $ctx), qr!default:\.!, 'default server');
-like(get('default', port(8080), $ctx), qr!default:r!, 'default server reused');
+like(get('default', port(8443), $ctx), qr!default:\.!, 'default server');
+like(get('default', port(8443), $ctx), qr!default:r!, 'default server reused');

# check that sessions are still properly saved and restored
# when using an SNI-based virtual server with different session cache;
@@ -154,16 +154,16 @@ like(get('default', port(8080), $ctx), q

$ctx = get_ssl_context();

-like(get('nocache', port(8080), $ctx), qr!nocache:\.!, 'without cache');
-like(get('nocache', port(8080), $ctx), qr!nocache:r!, 'without cache reused');
+like(get('nocache', port(8443), $ctx), qr!nocache:\.!, 'without cache');
+like(get('nocache', port(8443), $ctx), qr!nocache:r!, 'without cache reused');

# make sure tickets can be used if an SNI-based virtual server
# uses a different set of session ticket keys explicitly set

$ctx = get_ssl_context();

-like(get('tickets', port(8081), $ctx), qr!tickets:\.!, 'tickets');
-like(get('tickets', port(8081), $ctx), qr!tickets:r!, 'tickets reused');
+like(get('tickets', port(8444), $ctx), qr!tickets:\.!, 'tickets');
+like(get('tickets', port(8444), $ctx), qr!tickets:r!, 'tickets reused');

###############################################################################

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
https://mailman.nginx.org/mailman/listinfo/nginx-devel