diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-05 09:35:24 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-05 09:35:24 +0200 |
| commit | f509fb7cef82413b19db0734a314c216b30a415c (patch) | |
| tree | 10cb58fe6a74ae33fab345f2042e5924119b2038 /lib/ssl/src/ssl_connection_sup.erl | |
| parent | d73dc3d3c6d85f0d2bb332458d5f52c576e27715 (diff) | |
| parent | e7f8debed1ecd2b506b28d7aa068d409948130d2 (diff) | |
| download | otp-f509fb7cef82413b19db0734a314c216b30a415c.tar.gz otp-f509fb7cef82413b19db0734a314c216b30a415c.tar.bz2 otp-f509fb7cef82413b19db0734a314c216b30a415c.zip | |
Merge branch 'ia/ssl/prep-dtls' into maint
* ia/ssl/prep-dtls:
ssl: Structural perarparation to support DTLS
ssl: Rename ssl_certificate_db to ssl_pkix_db for clarity
Diffstat (limited to 'lib/ssl/src/ssl_connection_sup.erl')
| -rw-r--r-- | lib/ssl/src/ssl_connection_sup.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_connection_sup.erl b/lib/ssl/src/ssl_connection_sup.erl index 78cfda5e63..fb1c6e11a6 100644 --- a/lib/ssl/src/ssl_connection_sup.erl +++ b/lib/ssl/src/ssl_connection_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2011. All Rights Reserved. +%% Copyright Ericsson AB 2007-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -56,10 +56,10 @@ init(_O) -> MaxT = 3600, Name = undefined, % As simple_one_for_one is used. - StartFunc = {ssl_connection, start_link, []}, + StartFunc = {tls_connection, start_link, []}, Restart = temporary, % E.g. should not be restarted Shutdown = 4000, - Modules = [ssl_connection], + Modules = [tls_connection], Type = worker, ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules}, |