diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-05-15 09:52:11 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-05-15 09:52:11 +0200 |
| commit | af386cc23e1085fb32aba9d0ada56d9b6a6ca65c (patch) | |
| tree | 905bdad29417f84cc7117e71dc07274b0f7a779e | |
| parent | e5ea301e8d8a6c0dac6c527311250e31670e7c3b (diff) | |
| parent | e7e750a40ff875e6d62f1e7904470222ac8de269 (diff) | |
| download | otp-af386cc23e1085fb32aba9d0ada56d9b6a6ca65c.tar.gz otp-af386cc23e1085fb32aba9d0ada56d9b6a6ca65c.tar.bz2 otp-af386cc23e1085fb32aba9d0ada56d9b6a6ca65c.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_socket.erl | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 1eda926bcb..f681204de6 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -602,7 +602,7 @@ cipher(#finished{verify_data = Data} = Finished, cipher(#next_protocol{selected_protocol = SelectedProtocol}, #state{role = server, expecting_next_protocol_negotiation = true} = State0, Connection) -> {Record, State} = Connection:next_record(State0#state{next_protocol = SelectedProtocol}), - Connection:next_state(cipher, cipher, Record, State); + Connection:next_state(cipher, cipher, Record, State#state{expecting_next_protocol_negotiation = false}); cipher(timeout, State, _) -> {next_state, cipher, State, hibernate}; diff --git a/lib/ssl/src/ssl_socket.erl b/lib/ssl/src/ssl_socket.erl index e42d637301..8532788ffd 100644 --- a/lib/ssl/src/ssl_socket.erl +++ b/lib/ssl/src/ssl_socket.erl @@ -162,10 +162,11 @@ handle_cast(_, State)-> {noreply, State}. %%-------------------------------------------------------------------- --spec handle_info(msg(), #state{}) -> {noreply, #state{}}. +-spec handle_info(msg(), #state{}) -> {stop, reason(), #state{}}. %% Possible return values not used now. +%% {noreply, #state{}}. %% |{noreply, #state{}, timeout()} | -%% {stop, reason(), #state{}}. +%% %% %% Description: Handling all non call/cast messages %%------------------------------------------------------------------- |