aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-05-04 11:27:41 +0200
committerIngela Anderton Andin <[email protected]>2011-05-04 11:27:41 +0200
commitaecb7fc8cc7fd930bc50d7d1a0415e0776b99937 (patch)
tree9e736bf032a1ac533a51252c740a96fdb8304da2
parent16e5d9e8197cde06261f1738907f38ebaafccb7d (diff)
parentb40f707bc0e011675498b0f8503e91f3dfcfc971 (diff)
downloadotp-aecb7fc8cc7fd930bc50d7d1a0415e0776b99937.tar.gz
otp-aecb7fc8cc7fd930bc50d7d1a0415e0776b99937.tar.bz2
otp-aecb7fc8cc7fd930bc50d7d1a0415e0776b99937.zip
Merge branch 'ia/ssl/dialyzer-socket-options-spec' into dev
* ia/ssl/dialyzer-socket-options-spec: Dialyzer spec fix
-rw-r--r--lib/ssl/src/ssl.erl3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index ae0f8477fc..c3e0bcf466 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -50,8 +50,7 @@
cb %% Callback info
}).
-type option() :: socketoption() | ssloption() | transportoption().
--type socketoption() :: [{property(), term()}]. %% See gen_tcp and inet
--type property() :: atom().
+-type socketoption() :: term(). %% See gen_tcp and inet, import spec later when there is one to import
-type ssloption() :: {verify, verify_type()} |
{verify_fun, {fun(), InitialUserState::term()}} |
{fail_if_no_peer_cert, boolean()} | {depth, integer()} |