diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-02-25 11:45:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-02-25 11:45:03 +0100 |
| commit | 95811d8f832076c329166fb529394ca015266ea2 (patch) | |
| tree | aa7d4d19b060a1e03e85314fb593d6b307cfb112 /lib/ssl/src | |
| parent | 13411a7783355f9d2f40acd6859955e0f233a96e (diff) | |
| parent | 87ed3fe4d7ddbc3c64d182032e9fe054600cf5ba (diff) | |
| download | otp-95811d8f832076c329166fb529394ca015266ea2.tar.gz otp-95811d8f832076c329166fb529394ca015266ea2.tar.bz2 otp-95811d8f832076c329166fb529394ca015266ea2.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 3afc3a5e87..780bef5877 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -60,22 +60,19 @@ -spec start() -> ok | {error, reason()}. -spec start(permanent | transient | temporary) -> ok | {error, reason()}. %% -%% Description: Utility function that starts the ssl, -%% crypto and public_key applications. Default type -%% is temporary. see application(3) +%% Description: Utility function that starts the ssl and applications +%% that it depends on. +%% see application(3) %%-------------------------------------------------------------------- start() -> - application:start(crypto), - application:start(asn1), - application:start(public_key), - application:start(ssl). - + start(temporary). start(Type) -> - application:start(crypto, Type), - application:start(asn1), - application:start(public_key, Type), - application:start(ssl, Type). - + case application:ensure_all_started(ssl, Type) of + {ok, _} -> + ok; + Other -> + Other + end. %%-------------------------------------------------------------------- -spec stop() -> ok. %% |