Mercurial > hg > nginx-tests
changeset 1421:4e48bf51714f
Tests: aligned various generic read timeouts to http_end().
It was observed that previous timeout values could not be enough when
making mass-building, in particular, when running with modsecurity.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Mon, 24 Dec 2018 14:24:51 +0300 |
parents | ea593a9bab09 |
children | 2d7fcd713b66 |
files | h2_fastcgi_request_buffering.t h2_proxy_request_buffering.t h2_proxy_request_buffering_ssl.t h2_ssl_verify_client.t lib/Test/Nginx/HTTP2.pm ssl.t ssl_certificate_chain.t ssl_certificates.t ssl_client_escaped_cert.t ssl_crl.t ssl_password_file.t ssl_proxy_protocol.t ssl_sni.t ssl_sni_reneg.t ssl_sni_sessions.t ssl_stapling.t ssl_verify_depth.t stream_ssl_preread.t stream_ssl_preread_alpn.t stream_ssl_realip.t |
diffstat | 20 files changed, 22 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/h2_fastcgi_request_buffering.t Wed Dec 19 12:51:18 2018 +0300 +++ b/h2_fastcgi_request_buffering.t Mon Dec 24 14:24:51 2018 +0300 @@ -265,7 +265,7 @@ my ($s, $timo) = @_; my $buf = ''; - if (IO::Select->new($s)->can_read($timo || 5)) { + if (IO::Select->new($s)->can_read($timo || 8)) { $s->sysread($buf, 16384) or return; log2i($buf); }
--- a/h2_proxy_request_buffering.t Wed Dec 19 12:51:18 2018 +0300 +++ b/h2_proxy_request_buffering.t Mon Dec 24 14:24:51 2018 +0300 @@ -265,7 +265,7 @@ my ($s, $timo) = @_; my $buf = ''; - if (IO::Select->new($s)->can_read($timo || 5)) { + if (IO::Select->new($s)->can_read($timo || 8)) { $s->sysread($buf, 16384) or return; log2i($buf); }
--- a/h2_proxy_request_buffering_ssl.t Wed Dec 19 12:51:18 2018 +0300 +++ b/h2_proxy_request_buffering_ssl.t Mon Dec 24 14:24:51 2018 +0300 @@ -270,7 +270,7 @@ my ($s, $timo) = @_; my $buf = ''; - if (IO::Select->new($s)->can_read($timo || 5)) { + if (IO::Select->new($s)->can_read($timo || 8)) { $s->sysread($buf, 16384) or return; log2i($buf); }
--- a/h2_ssl_verify_client.t Wed Dec 19 12:51:18 2018 +0300 +++ b/h2_ssl_verify_client.t Mon Dec 24 14:24:51 2018 +0300 @@ -114,7 +114,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/lib/Test/Nginx/HTTP2.pm Wed Dec 19 12:51:18 2018 +0300 +++ b/lib/Test/Nginx/HTTP2.pm Mon Dec 24 14:24:51 2018 +0300 @@ -465,7 +465,7 @@ sub raw_read { my ($s, $buf, $len, $timo) = @_; - $timo = 5 unless $timo; + $timo = 8 unless $timo; my $got = ''; while (length($buf) < $len && IO::Select->new($s)->can_read($timo)) { @@ -501,7 +501,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::INET->new( Proto => 'tcp', PeerAddr => "127.0.0.1:$port",
--- a/ssl.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl.t Mon Dec 24 14:24:51 2018 +0300 @@ -300,7 +300,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_certificate_chain.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_certificate_chain.t Mon Dec 24 14:24:51 2018 +0300 @@ -150,7 +150,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_certificates.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_certificates.t Mon Dec 24 14:24:51 2018 +0300 @@ -121,7 +121,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::INET->new('127.0.0.1:' . port(8080)); alarm(0); };
--- a/ssl_client_escaped_cert.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_client_escaped_cert.t Mon Dec 24 14:24:51 2018 +0300 @@ -101,7 +101,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_crl.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_crl.t Mon Dec 24 14:24:51 2018 +0300 @@ -178,7 +178,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_password_file.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_password_file.t Mon Dec 24 14:24:51 2018 +0300 @@ -147,7 +147,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1:' . port(8081),
--- a/ssl_proxy_protocol.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_proxy_protocol.t Mon Dec 24 14:24:51 2018 +0300 @@ -156,7 +156,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); IO::Socket::SSL->start_SSL($s, SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(), SSL_error_trap => sub { die $_[1] }
--- a/ssl_sni.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_sni.t Mon Dec 24 14:24:51 2018 +0300 @@ -133,7 +133,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1:' . port(8080),
--- a/ssl_sni_reneg.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_sni_reneg.t Mon Dec 24 14:24:51 2018 +0300 @@ -171,7 +171,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); socket($s, &AF_INET, &SOCK_STREAM, 0) or die "socket: $!"; connect($s, $dest_serv_params) or die "connect: $!"; alarm(0);
--- a/ssl_sni_sessions.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_sni_sessions.t Mon Dec 24 14:24:51 2018 +0300 @@ -177,7 +177,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/ssl_stapling.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_stapling.t Mon Dec 24 14:24:51 2018 +0300 @@ -294,7 +294,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::INET->new('127.0.0.1:' . port($port)); alarm(0); }; @@ -335,7 +335,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::INET->new('127.0.0.1:' . port(8443)); alarm(0); };
--- a/ssl_verify_depth.t Wed Dec 19 12:51:18 2018 +0300 +++ b/ssl_verify_depth.t Mon Dec 24 14:24:51 2018 +0300 @@ -142,7 +142,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); $s = IO::Socket::SSL->new( Proto => 'tcp', PeerAddr => '127.0.0.1',
--- a/stream_ssl_preread.t Wed Dec 19 12:51:18 2018 +0300 +++ b/stream_ssl_preread.t Mon Dec 24 14:24:51 2018 +0300 @@ -223,7 +223,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); IO::Socket::SSL->start_SSL($s->{_socket}, SSL_hostname => $host, SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(),
--- a/stream_ssl_preread_alpn.t Wed Dec 19 12:51:18 2018 +0300 +++ b/stream_ssl_preread_alpn.t Mon Dec 24 14:24:51 2018 +0300 @@ -127,7 +127,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); IO::Socket::SSL->start_SSL($s->{_socket}, SSL_alpn_protocols => [ @alpn ], SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(),
--- a/stream_ssl_realip.t Wed Dec 19 12:51:18 2018 +0300 +++ b/stream_ssl_realip.t Mon Dec 24 14:24:51 2018 +0300 @@ -134,7 +134,7 @@ eval { local $SIG{ALRM} = sub { die "timeout\n" }; local $SIG{PIPE} = sub { die "sigpipe\n" }; - alarm(5); + alarm(8); IO::Socket::SSL->start_SSL($s->{_socket}, SSL_verify_mode => IO::Socket::SSL::SSL_VERIFY_NONE(), SSL_error_trap => sub { die $_[1] }