diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-09-20 10:59:52 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-09-20 10:59:52 +0200 |
| commit | 7fbb86c77fa99caddabedfb992f47ddeece80652 (patch) | |
| tree | c05a6ceea05d7fc4233ecf48049c76633eabfd42 | |
| parent | 81f7ac4dae50339ce3549290c9081d23e87ce3c1 (diff) | |
| parent | 668607afa7ccbe9289dead30d81cb39c18fa4789 (diff) | |
| download | otp-7fbb86c77fa99caddabedfb992f47ddeece80652.tar.gz otp-7fbb86c77fa99caddabedfb992f47ddeece80652.tar.bz2 otp-7fbb86c77fa99caddabedfb992f47ddeece80652.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/src/tls_connection.erl | 1 | ||||
| -rw-r--r-- | lib/ssl/src/tls_sender.erl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl index f7eb79400e..94a4fa511d 100644 --- a/lib/ssl/src/tls_connection.erl +++ b/lib/ssl/src/tls_connection.erl @@ -119,6 +119,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. |