diff options
author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-16 14:16:26 +0200 |
---|---|---|
committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2018-04-26 18:35:18 +0200 |
commit | bc6614484563f975a380bc97e907ce289036b802 (patch) | |
tree | f2c9f92a649f83b3b1bedd68b56d302e7a94332c | |
parent | f06080cb3da93e99755edb5f19e7ccc132aeba36 (diff) |
Wait max. 60 seconds for s_client to connect
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5964)
-rw-r--r-- | util/perl/TLSProxy/Proxy.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm index de6d2fdf50..8df0153d24 100644 --- a/util/perl/TLSProxy/Proxy.pm +++ b/util/perl/TLSProxy/Proxy.pm @@ -349,7 +349,7 @@ sub clientstart # Wait for incoming connection from client my $fdset = IO::Select->new($self->{proxy_sock}); - if (!$fdset->can_read(1)) { + if (!$fdset->can_read(60)) { kill(3, $self->{real_serverpid}); die "s_client didn't try to connect\n"; } |