aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-11-06 09:35:45 +0100
committerIngela Anderton Andin <[email protected]>2018-11-06 09:35:45 +0100
commite7e3f59e5350bb39f57f0403f3c78443c58039b1 (patch)
treeba87b01ee86e26d0fef001b4aed4074edda5caa3 /lib/ssl/src
parent8f4eb75f5a8d3f76d4e5e1c7d56024c727358ac7 (diff)
parente64822b68ec1f06481af5ea776273b6dbb526d63 (diff)
downloadotp-e7e3f59e5350bb39f57f0403f3c78443c58039b1.tar.gz
otp-e7e3f59e5350bb39f57f0403f3c78443c58039b1.tar.bz2
otp-e7e3f59e5350bb39f57f0403f3c78443c58039b1.zip
Merge branch 'ingela/ssl/controlling-process-allowed-on-transport-accept-socket' into maint
* ingela/ssl/controlling-process-allowed-on-transport-accept-socket: ssl: controlling_process should be allowed on transpor_accept sockets along with handshake
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl_connection.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 8ccad74646..acd9f14f7b 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -621,6 +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}, {new_user, _} = 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) ->