diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-12-10 17:21:08 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-12-10 17:21:08 +0000 |
| commit | e377020e7158b8cd2be9519400ba942d6ea6fcb2 (patch) | |
| tree | fca33db4555bc9b72bb8bc04263f52c2d4818f8b | |
| parent | 7f1e98859f352f86b0f965d3d14841c557ef7eee (diff) | |
| download | rabbitmq-server-bug22117.tar.gz | |
don't wait forever for ssl negotiation to succeedbug22117
| -rw-r--r-- | src/rabbit_networking.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index b45d9942..41d46743 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -53,6 +53,9 @@ %% {delay_send, true}, {exit_on_close, false} ]). + +-define(SSL_TIMEOUT, 5). + %%---------------------------------------------------------------------------- -ifdef(use_specs). @@ -173,7 +176,7 @@ start_ssl_client(SslOpts, Sock) -> start_client( Sock, fun (Sock1) -> - case catch ssl:ssl_accept(Sock1, SslOpts) of + case catch ssl:ssl_accept(Sock1, SslOpts, ?SSL_TIMEOUT * 1000) of {ok, SslSock} -> rabbit_log:info("upgraded TCP connection ~p to SSL~n", [self()]), |