diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-12-06 15:02:30 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-12-06 15:02:30 +0100 |
| commit | 214d1aaf4749ae6a7bb0506cf448551a312a9a58 (patch) | |
| tree | 380065f3e00e8cd3de49f155a9db41ceb6c6a68b /lib/ssl/src/ssl.erl | |
| parent | af68f5a22f995284b07ece178c42e630ecf94d54 (diff) | |
| parent | 2eb32af0fdd74bb4d61f952fbd96e548bb916eb1 (diff) | |
| download | otp-214d1aaf4749ae6a7bb0506cf448551a312a9a58.tar.gz otp-214d1aaf4749ae6a7bb0506cf448551a312a9a58.tar.bz2 otp-214d1aaf4749ae6a7bb0506cf448551a312a9a58.zip | |
Merge tag 'erl_1218' into maint
ssl: Patch 1218
OTP-10600 ssl:ssl_accept/2 timeout is no longer ignored
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(). |