diff options
| author | Loïc Hoguin <[email protected]> | 2014-11-05 13:00:20 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-11-05 13:00:20 +0200 |
| commit | 26a3c3683ee74ae30f53106d634704c5c71a15bb (patch) | |
| tree | b080214c90617eb0ea3c92850ddc76ee4879bb16 | |
| parent | 46897b979056e7c0d00a676213bf98f2ae147168 (diff) | |
| parent | 17829e4c67d8ceb922629aa68fa6c974e9b1006d (diff) | |
| download | ranch-26a3c3683ee74ae30f53106d634704c5c71a15bb.tar.gz ranch-26a3c3683ee74ae30f53106d634704c5c71a15bb.tar.bz2 ranch-26a3c3683ee74ae30f53106d634704c5c71a15bb.zip | |
Merge branch 'master' of git://github.com/dergraf/ranch
| -rw-r--r-- | src/ranch_ssl.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl index 61b939b..a353c97 100644 --- a/src/ranch_ssl.erl +++ b/src/ranch_ssl.erl @@ -51,6 +51,8 @@ | {log_alert, boolean()} | {next_protocols_advertised, [binary()]} | {nodelay, boolean()} + | {partial_chain, fun(([Der::binary()]) -> + {trusted_ca, Der::binary()} | unknown_ca)} | {password, string()} | {port, inet:port_number()} | {raw, non_neg_integer(), non_neg_integer(), @@ -90,7 +92,7 @@ listen(Opts) -> fail_if_no_peer_cert, hibernate_after, honor_cipher_order, ip, key, keyfile, linger, next_protocols_advertised, nodelay, - log_alert, password, port, raw, + log_alert, partial_chain, password, port, raw, reuse_session, reuse_sessions, secure_renegotiate, send_timeout, send_timeout_close, verify, verify_fun, versions], |