diff options
author | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:01:39 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2016-12-06 09:01:39 +0100 |
commit | b91e7498e625b4e6419238f753c30b509fb958d2 (patch) | |
tree | 13242c026475c2942ee3c998c8b12816f8b65646 /lib/ssl/src/ssl_dist_sup.erl | |
parent | f015c1ae35a94ca52e80ceae7a76806fe848a553 (diff) | |
parent | 1e6942e97339ff39a0436834c260bf50c3d3a481 (diff) | |
download | otp-b91e7498e625b4e6419238f753c30b509fb958d2.tar.gz otp-b91e7498e625b4e6419238f753c30b509fb958d2.tar.bz2 otp-b91e7498e625b4e6419238f753c30b509fb958d2.zip |
Merge branch 'ingela/dtls/statem/OTP-12982' into maint
* ingela/dtls/statem/OTP-12982:
ssl: Implement DTLS state machine
Diffstat (limited to 'lib/ssl/src/ssl_dist_sup.erl')
-rw-r--r-- | lib/ssl/src/ssl_dist_sup.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl index a6eb1be1f6..d47cd76bf5 100644 --- a/lib/ssl/src/ssl_dist_sup.erl +++ b/lib/ssl/src/ssl_dist_sup.erl @@ -85,10 +85,10 @@ proxy_server_child_spec() -> {Name, StartFunc, Restart, Shutdown, Type, Modules}. listen_options_tracker_child_spec() -> - Name = ssl_socket_dist, + Name = tls_socket_dist, StartFunc = {ssl_listen_tracker_sup, start_link_dist, []}, Restart = permanent, Shutdown = 4000, - Modules = [ssl_socket], + Modules = [tls_socket], Type = supervisor, {Name, StartFunc, Restart, Shutdown, Type, Modules}. |