mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-15 04:53:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

TLSProxy/Proxy.pm: handle "impossible" failure to connect to s_server.

Browse Source 
The failure is "impossible", because we have confirmation that s_server
listens, yet Mac OS X fails to connect. This avoids 10 minutes timeout
on Travis CI.

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5907)
This commit is contained in:
Andy Polyakov 2018-04-11 14:56:37 +02:00
parent 6b3e8b9430
commit b4c1950d89
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/perl/TLSProxy/Proxy.pm
View File

@ -189,10 +189,16 @@ sub connect_to_server
$servaddr =~ s/[\[\]]//g; # Remove [ and ] $servaddr =~ s/[\[\]]//g; # Remove [ and ]
$self->{server_sock} = $IP_factory->(PeerAddr => $servaddr, my $sock = $IP_factory->(PeerAddr => $servaddr,
PeerPort => $self->{server_port}, PeerPort => $self->{server_port},
Proto => 'tcp') Proto => 'tcp');
or die "unable to connect: $!\n"; if (!defined($sock)) {
my $err = $!;
kill(3, $self->{real_serverpid});
die "unable to connect: $err\n";
}
$self->{server_sock} = $sock;
} }
sub start sub start