diff options
| author | Raimo Niskanen <[email protected]> | 2019-03-04 12:01:05 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-03-04 12:01:05 +0100 |
| commit | 2a527454677dc0216c5d47ad580aad2e913e1b9a (patch) | |
| tree | 4e0de1d8aacda87772dbf6627062c9bf11708503 /lib/ssl/src/ssl.erl | |
| parent | 50f077016bef70c58a6395583369cadeeb0ff90e (diff) | |
| parent | df25e742f1ab87f8dbb290eed8e24ec919c3780a (diff) | |
| download | otp-2a527454677dc0216c5d47ad580aad2e913e1b9a.tar.gz otp-2a527454677dc0216c5d47ad580aad2e913e1b9a.tar.bz2 otp-2a527454677dc0216c5d47ad580aad2e913e1b9a.zip | |
Merge branch 'maint'
* maint:
fixup! ssl: Add support for {active,N}
ssl: Use common fonction to update {active,N}
ssl: Document {active,N}
ssl: Add support for {active,N}
Diffstat (limited to 'lib/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 3516bd6d49..5a2d31ffc2 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -94,7 +94,7 @@ -type tls_client_option() :: client_option() | common_option() | socket_option() | transport_option(). -type tls_server_option() :: server_option() | common_option() | socket_option() | transport_option(). -type active_msgs() :: {ssl, sslsocket(), Data::binary() | list()} | {ssl_closed, sslsocket()} | - {ssl_error, sslsocket(), Reason::term()}. + {ssl_error, sslsocket(), Reason::term()} | {ssl_passive, sslsocket()}. -type transport_option() :: {cb_info, {CallbackModule::atom(), DataTag::atom(), ClosedTag::atom(), ErrTag::atom()}}. -type host() :: hostname() | ip_address(). |