diff options
| author | Kostis Sagonas <[email protected]> | 2012-12-13 16:20:21 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-01-23 19:43:26 +0100 |
| commit | c72c762d594e30e04ddc021abf589d277d60b475 (patch) | |
| tree | 0b44d622181b3512eca8189fa86b99665368e8f0 /lib/ssl | |
| parent | 0ab216f3dc96890b50f7430895ad5d7f6251f129 (diff) | |
| download | otp-c72c762d594e30e04ddc021abf589d277d60b475.tar.gz otp-c72c762d594e30e04ddc021abf589d277d60b475.tar.bz2 otp-c72c762d594e30e04ddc021abf589d277d60b475.zip | |
ssl: Remove unnecessary construction of a return value
Diffstat (limited to 'lib/ssl')
| -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}]), |