diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-01-25 10:44:50 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-01-25 10:44:50 +0100 |
| commit | ded09e07cdc5f899d4f550c62ad5dfe04aa32403 (patch) | |
| tree | 75ffdf8e77415ff0eb6a545b13df60ccd398b6ee /lib/ssl/src/ssl_connection.erl | |
| parent | 22df26ed06c0b35fab59005764e46fc0a8c5b13a (diff) | |
| parent | 139f5c6aaae6c4f699ed883840c6875c05177d52 (diff) | |
| download | otp-ded09e07cdc5f899d4f550c62ad5dfe04aa32403.tar.gz otp-ded09e07cdc5f899d4f550c62ad5dfe04aa32403.tar.bz2 otp-ded09e07cdc5f899d4f550c62ad5dfe04aa32403.zip | |
Merge branch 'ia/ssl/dialyzer'
* ia/ssl/dialyzer:
ssl: Enhance dialyzer specs
ssl: Do not return random values
ssl: M-x erlang-indent-buffer
ssl: Remove unnecessary construction of a return value
Diffstat (limited to 'lib/ssl/src/ssl_connection.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 68f6a4d4c1..e5a6181a88 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -372,8 +372,7 @@ hello(#server_hello{cipher_suite = CipherSuite, ssl_options = SslOptions} = State0) -> case ssl_handshake:hello(Hello, SslOptions, ConnectionStates0, Renegotiation) of #alert{} = Alert -> - handle_own_alert(Alert, ReqVersion, hello, State0), - {stop, {shutdown, own_alert}, State0}; + handle_own_alert(Alert, ReqVersion, hello, State0); {Version, NewId, ConnectionStates, NextProtocol} -> {KeyAlgorithm, _, _, _} = ssl_cipher:suite_definition(CipherSuite), @@ -2510,12 +2509,13 @@ default_hashsign(_Version, KeyExchange) start_or_recv_cancel_timer(infinity, _RecvFrom) -> undefined; start_or_recv_cancel_timer(Timeout, RecvFrom) -> - erlang:send_after(Timeout, self(), {cancel_start_or_recv, RecvFrom}). + erlang:send_after(Timeout, self(), {cancel_start_or_recv, RecvFrom}). cancel_timer(undefined) -> ok; cancel_timer(Timer) -> - erlang:cancel_timer(Timer). + erlang:cancel_timer(Timer), + ok. handle_unrecv_data(StateName, #state{socket = Socket, transport_cb = Transport} = State) -> inet:setopts(Socket, [{active, false}]), |