diff options
author | Ingela Anderton Andin <[email protected]> | 2018-11-02 09:29:36 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-11-02 09:29:36 +0100 |
commit | f9aa2fbb81470e9d58efe2cff7e394888c14a779 (patch) | |
tree | c246e69d5d13cdf650b662c2594594e1690d0e19 /lib/ssl/src | |
parent | 91776a3b24e89a343dfa5769747e72e95b194a29 (diff) | |
parent | 68d9244ae33e5eea36250c3bb9ffe046a4db5647 (diff) | |
download | otp-f9aa2fbb81470e9d58efe2cff7e394888c14a779.tar.gz otp-f9aa2fbb81470e9d58efe2cff7e394888c14a779.tar.bz2 otp-f9aa2fbb81470e9d58efe2cff7e394888c14a779.zip |
Merge branch 'ingela/ssl/transport-accept-socket/ERL-756/OTP-15384' into maint
* ingela/ssl/transport-accept-socket/ERL-756/OTP-15384:
ssl: Return error to user that tries to use a "transport accepted" socket for other purposes than handshaking
Diffstat (limited to 'lib/ssl/src')
-rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 9f876add6c..8ccad74646 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -621,8 +621,8 @@ init({call, From}, {start, {Opts, EmOpts}, Timeout}, catch throw:Error -> stop_and_reply(normal, {reply, From, {error, Error}}, State0) end; -init({call, From}, Msg, State, Connection) -> - handle_call(Msg, From, ?FUNCTION_NAME, State, Connection); +init({call, From}, _Msg, _State, _Connection) -> + {keep_state_and_data, [{reply, From, {error, notsup_on_transport_accept_socket}}]}; init(_Type, _Event, _State, _Connection) -> {keep_state_and_data, [postpone]}. |