diff options
| author | Erlang/OTP <[email protected]> | 2012-12-06 14:49:31 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2012-12-06 14:49:31 +0100 |
| commit | 2067c7c77d74b715c77648b37517a06e163c4b6b (patch) | |
| tree | a92a91598fb11846fe422aed017ee53753ae8db3 /lib/ssl/src/ssl.erl | |
| parent | d5de2e1ffd6403f5d7ec62e6ce8da508e1cb1239 (diff) | |
| parent | 51e291fe0ae69412ee3d2cbde768c92e3f239a2f (diff) | |
| download | otp-2067c7c77d74b715c77648b37517a06e163c4b6b.tar.gz otp-2067c7c77d74b715c77648b37517a06e163c4b6b.tar.bz2 otp-2067c7c77d74b715c77648b37517a06e163c4b6b.zip | |
Merge branch 'egil/ia/ssl/accept-timeout/OTP-10600' into maint-r15
* egil/ia/ssl/accept-timeout/OTP-10600:
ssl: Prepare for release
ssl: Export sslsocket() dialyzer type
ssl: Cancel non expired timers
ssl: Fix recv after timeout expired
ssl: Timeout handling changed so that the fsm-process will terminate if the ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires.
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 69e8d868fa..66ceb2a591 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -45,7 +45,7 @@ -export_type([connect_option/0, listen_option/0, ssl_option/0, transport_option/0, erl_cipher_suite/0, %% From ssl_cipher.hrl tls_atom_version/0, %% From ssl_internal.hrl - prf_random/0]). + prf_random/0, sslsocket/0]). -record(config, {ssl, %% SSL parameters inet_user, %% User set inet options @@ -53,6 +53,8 @@ inet_ssl, %% inet options for internal ssl socket cb %% Callback info }). + +-type sslsocket() :: #sslsocket{}. -type connect_option() :: socket_connect_option() | ssl_option() | transport_option(). -type socket_connect_option() :: gen_tcp:connect_option(). -type listen_option() :: socket_listen_option() | ssl_option() | transport_option(). |