Commit b4c1950d authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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



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: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5907)
parent 6b3e8b94

util/perl/TLSProxy/Proxy.pm

+10 −4
Original line number Original line Diff line number Diff line
@@ -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