diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-05-05 11:28:22 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-05-05 11:28:22 +0200 |
| commit | aa9497c99e4668c5f6a6a1bde2effcb8e9fb8617 (patch) | |
| tree | 64e514089962cd001d456e311c6eb325322edb20 /lib/ssl/src | |
| parent | b39153c1db8e311e6fb759f7c778b10340902890 (diff) | |
| parent | adcf5eb5f43ed83a0bb9aacdffa155c0b02ed0c3 (diff) | |
| download | otp-aa9497c99e4668c5f6a6a1bde2effcb8e9fb8617.tar.gz otp-aa9497c99e4668c5f6a6a1bde2effcb8e9fb8617.tar.bz2 otp-aa9497c99e4668c5f6a6a1bde2effcb8e9fb8617.zip | |
Merge branch 'ia/ssl/more-socket-options-dialyzer-issues' into dev
* ia/ssl/more-socket-options-dialyzer-issues:
Spec corrections
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index c3e0bcf466..380c59b058 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -402,9 +402,9 @@ cipher_suites(openssl) -> [ssl_cipher:openssl_suite_name(S) || S <- ssl_cipher:suites(Version)]. %%-------------------------------------------------------------------- --spec getopts(#sslsocket{}, [atom()]) -> {ok, [{atom(), term()}]}| {error, reason()}. +-spec getopts(#sslsocket{}, [atom()]) -> {ok, [{atom(), term()}]} | {error, reason()}. %% -%% Description: +%% Description: Gets options %%-------------------------------------------------------------------- getopts(#sslsocket{fd = new_ssl, pid = Pid}, OptTags) when is_pid(Pid) -> ssl_connection:get_opts(Pid, OptTags); @@ -415,9 +415,9 @@ getopts(#sslsocket{} = Socket, Options) -> ssl_broker:getopts(Socket, Options). %%-------------------------------------------------------------------- --spec setopts(#sslsocket{}, [{atom(), term()}]) -> ok | {error, reason()}. +-spec setopts(#sslsocket{}, [proplist:property()]) -> ok | {error, reason()}. %% -%% Description: +%% Description: Sets options %%-------------------------------------------------------------------- setopts(#sslsocket{fd = new_ssl, pid = Pid}, Opts0) when is_pid(Pid) -> Opts = proplists:expand([{binary, [{mode, binary}]}, |