47
47
ssl_certificate localhost.crt;
48
48
49
49
server {
50
- listen 127.0.0.1:8080 ssl http2;
50
+ listen 127.0.0.1:8443 ssl http2;
51
51
listen 127.0.0.1:%%PORT_8980_UDP%% quic;
52
52
server_name ~^(?P<name>.+)\.example\.com$;
53
53
@@ -97,19 +97,20 @@ is(get3('test.example.com', 'localhost'), 'test', 'http3 - sni not found');
97
97
98
98
sub get1 {
99
99
my ($host , $sni ) = @_ ;
100
- my $s = get_ssl_socket(sni => $sni || $host , alpn => [' http/1.1' ]);
101
- http(<<EOF , socket => $s ) =~ / .*?\x0d\x0a ?\x0d\x0a ?(.*)/ms ;
102
- GET / HTTP/1.1
103
- Host: $host
104
- Connection: close
105
-
106
- EOF
100
+ http(" GET / HTTP/1.0\n Host: $host \n\n " ,
101
+ SSL => 1,
102
+ SSL_hostname => $sni || $host ,
103
+ SSL_alpn_protocols => [' http/1.1' ])
104
+ =~ / .*?\x0d\x0a ?\x0d\x0a ?(.*)/ms ;
107
105
return $1 ;
108
106
}
109
107
110
108
sub get2 {
111
109
my ($host , $sni ) = @_ ;
112
- my $sock = get_ssl_socket(sni => $sni || $host , alpn => [' h2' ]);
110
+ my $sock = http(' ' , start => 1,
111
+ SSL => 1,
112
+ SSL_hostname => $sni || $host ,
113
+ SSL_alpn_protocols => [' h2' ]);
113
114
my $s = Test::Nginx::HTTP2-> new(undef , socket => $sock );
114
115
my $sid = $s -> new_stream({ host => $host });
115
116
my $frames = $s -> read (all => [{ sid => $sid , fin => 1 }]);
@@ -128,33 +129,4 @@ sub get3 {
128
129
return $frame -> {data };
129
130
}
130
131
131
- sub get_ssl_socket {
132
- my (%extra ) = @_ ;
133
- my $s ;
134
-
135
- eval {
136
- local $SIG {ALRM } = sub { die " timeout\n " };
137
- local $SIG {PIPE } = sub { die " sigpipe\n " };
138
- alarm(8);
139
- $s = IO::Socket::SSL-> new(
140
- Proto => ' tcp' ,
141
- PeerAddr => ' 127.0.0.1' ,
142
- PeerPort => port(8080),
143
- SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(),
144
- SSL_hostname => $extra {sni },
145
- SSL_alpn_protocols => $extra {alpn },
146
- SSL_error_trap => sub { die $_ [1] }
147
- );
148
- alarm(0);
149
- };
150
- alarm(0);
151
-
152
- if ($@ ) {
153
- log_in(" died: $@ " );
154
- return undef ;
155
- }
156
-
157
- return $s ;
158
- }
159
-
160
132
# ##############################################################################
0 commit comments