aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-09-20 10:58:45 +0200
committerIngela Anderton Andin <[email protected]>2018-09-20 10:58:45 +0200
commit668607afa7ccbe9289dead30d81cb39c18fa4789 (patch)
tree37d01998009583a974d35f9d55719d57f04e088d /lib/ssl
parentd429150fd79d68f4d614e4a491e04c7c35a8d4b4 (diff)
parent81cf7b6c922f56b2de4656b91a6d1af0d9a9c432 (diff)
downloadotp-668607afa7ccbe9289dead30d81cb39c18fa4789.tar.gz
otp-668607afa7ccbe9289dead30d81cb39c18fa4789.tar.bz2
otp-668607afa7ccbe9289dead30d81cb39c18fa4789.zip
Merge branch 'ingela/ERL-622/fix' into maint
* ingela/ERL-622/fix: ssl: Move link to correct process
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/src/tls_connection.erl1
-rw-r--r--lib/ssl/src/tls_sender.erl4
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl
index 6c7511d2b3..2fde17a0fd 100644
--- a/lib/ssl/src/tls_connection.erl
+++ b/lib/ssl/src/tls_connection.erl
@@ -118,6 +118,7 @@ start_link(Role, Sender, Host, Port, Socket, Options, User, CbInfo) ->
init([Role, Sender, Host, Port, Socket, {SslOpts, _, _} = Options, User, CbInfo]) ->
process_flag(trap_exit, true),
+ link(Sender),
case SslOpts#ssl_options.erl_dist of
true ->
process_flag(priority, max);
diff --git a/lib/ssl/src/tls_sender.erl b/lib/ssl/src/tls_sender.erl
index 007fd345dd..db67d7ddff 100644
--- a/lib/ssl/src/tls_sender.erl
+++ b/lib/ssl/src/tls_sender.erl
@@ -67,9 +67,9 @@
%% same process is sending and receiving
%%--------------------------------------------------------------------
start() ->
- gen_statem:start_link(?MODULE, [], []).
+ gen_statem:start(?MODULE, [], []).
start(SpawnOpts) ->
- gen_statem:start_link(?MODULE, [], SpawnOpts).
+ gen_statem:start(?MODULE, [], SpawnOpts).
%%--------------------------------------------------------------------
-spec initialize(pid(), map()) -> ok.