diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-06-05 09:39:34 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-06-05 09:39:34 +0200 |
| commit | 854a124e4cf4067b22032c53e1d26125bdc4208f (patch) | |
| tree | 5309b00ab02478f962ef2cadc3a9274e8156ad91 /lib/ssl/src/ssl_connection_sup.erl | |
| parent | bef52cfebbbdc1f11f23387883a1e64a5d98fccc (diff) | |
| parent | f509fb7cef82413b19db0734a314c216b30a415c (diff) | |
| download | otp-854a124e4cf4067b22032c53e1d26125bdc4208f.tar.gz otp-854a124e4cf4067b22032c53e1d26125bdc4208f.tar.bz2 otp-854a124e4cf4067b22032c53e1d26125bdc4208f.zip | |
Merge remote-tracking branch 'upstream/maint'
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}, |