aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2014-06-03 12:54:11 +0200
committerLoïc Hoguin <[email protected]>2014-06-03 12:54:11 +0200
commita224a9b5b1e485ccfbd826bd2e03054379d3e94e (patch)
tree7c3c94c35fca46b2b0c09fcd5811cd4f5742979c /src
parentad2c080dc2825c9c705f8e542298253834abee1c (diff)
parent39795adb5376ae940b249fa91b147d732a89f67e (diff)
downloadranch-a224a9b5b1e485ccfbd826bd2e03054379d3e94e.tar.gz
ranch-a224a9b5b1e485ccfbd826bd2e03054379d3e94e.tar.bz2
ranch-a224a9b5b1e485ccfbd826bd2e03054379d3e94e.zip
Merge branch 'ssl_options' of git://github.com/talko/ranch
Diffstat (limited to 'src')
-rw-r--r--src/ranch_ssl.erl14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl
index 29e72f4..46bd12d 100644
--- a/src/ranch_ssl.erl
+++ b/src/ranch_ssl.erl
@@ -42,10 +42,12 @@
| {ciphers, [ssl:erl_cipher_suite()] | string()}
| {fail_if_no_peer_cert, boolean()}
| {hibernate_after, integer() | undefined}
+ | {honor_cipher_order, boolean()}
| {ip, inet:ip_address()}
| {key, Der::binary()}
| {keyfile, string()}
| {linger, {boolean(), non_neg_integer()}}
+ | {log_alert, boolean()}
| {next_protocols_advertised, [binary()]}
| {nodelay, boolean()}
| {password, string()}
@@ -58,7 +60,8 @@
| {send_timeout, timeout()}
| {send_timeout_close, boolean()}
| {verify, ssl:verify_type()}
- | {verify_fun, {fun(), InitialUserState::term()}}].
+ | {verify_fun, {fun(), InitialUserState::term()}}
+ | {versions, [atom()]}].
-export_type([opts/0]).
name() -> ssl.
@@ -79,10 +82,13 @@ listen(Opts) ->
%% first argument.
ssl:listen(0, ranch:filter_options(Opts5,
[backlog, cacertfile, cacerts, cert, certfile, ciphers,
- fail_if_no_peer_cert, hibernate_after, ip, key, keyfile,
- linger, next_protocols_advertised, nodelay, password, port, raw,
+ fail_if_no_peer_cert, hibernate_after,
+ honor_cipher_order, ip, key, keyfile, linger,
+ next_protocols_advertised, nodelay,
+ log_alert, password, port, raw,
reuse_session, reuse_sessions, secure_renegotiate,
- send_timeout, send_timeout_close, verify, verify_fun],
+ send_timeout, send_timeout_close, verify, verify_fun,
+ versions],
[binary, {active, false}, {packet, raw},
{reuseaddr, true}, {nodelay, true}])).