diff options
| author | Loïc Hoguin <[email protected]> | 2018-07-04 12:58:51 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-07-04 13:01:47 +0200 |
| commit | ad7efea77cdad5bba83529a7494b49d1e9a19ca0 (patch) | |
| tree | 3e7de543a431e7c057cf964cdcd086365b49a8d1 /src/ranch_ssl.erl | |
| parent | a767abb47e6d9a0817d37413e1b5c1d338b362d8 (diff) | |
| download | ranch-ad7efea77cdad5bba83529a7494b49d1e9a19ca0.tar.gz ranch-ad7efea77cdad5bba83529a7494b49d1e9a19ca0.tar.bz2 ranch-ad7efea77cdad5bba83529a7494b49d1e9a19ca0.zip | |
Return errors from Transport:handshake
The "normal" errors are still silenced when calling ranch:handshake.
Diffstat (limited to 'src/ranch_ssl.erl')
| -rw-r--r-- | src/ranch_ssl.erl | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl index f9203e6..e1e6532 100644 --- a/src/ranch_ssl.erl +++ b/src/ranch_ssl.erl @@ -136,24 +136,15 @@ accept_ack(CSocket, Timeout) -> ok. -spec handshake(inet:socket() | ssl:sslsocket(), opts(), timeout()) - -> {ok, ssl:sslsocket()}. + -> {ok, ssl:sslsocket()} | {error, any()}. handshake(CSocket, Opts, Timeout) -> case ssl:ssl_accept(CSocket, Opts, Timeout) of ok -> {ok, CSocket}; {ok, NewSocket} -> {ok, NewSocket}; - %% Garbage was most likely sent to the socket, don't error out. - {error, {tls_alert, _}} -> - ok = close(CSocket), - exit(normal); - %% Socket most likely stopped responding, don't error out. - {error, Reason} when Reason =:= timeout; Reason =:= closed -> - ok = close(CSocket), - exit(normal); - {error, Reason} -> - ok = close(CSocket), - error(Reason) + Error = {error, _} -> + Error end. %% @todo Probably filter Opts? |