diff options
| author | Henrik Nord <[email protected]> | 2015-06-10 11:45:43 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-06-10 12:00:55 +0200 |
| commit | cae8c56ef2efa671b3937f697998068dc008295b (patch) | |
| tree | d7ca3952792dcaba191ff80fd257a24e56cb976e /lib/ssl/src/ssl_manager.erl | |
| parent | eefcd9cca47152d15b14a10b891e93819390b51d (diff) | |
| parent | 916226427901f40d695d0d7d91106b0188900055 (diff) | |
| download | otp-cae8c56ef2efa671b3937f697998068dc008295b.tar.gz otp-cae8c56ef2efa671b3937f697998068dc008295b.tar.bz2 otp-cae8c56ef2efa671b3937f697998068dc008295b.zip | |
Merge branch 'ferd/deny-client-renegotiation'
* ferd/deny-client-renegotiation:
Add disable client-initiated renegotiation option
Conflicts:
lib/ssl/doc/src/ssl.xml
lib/ssl/src/ssl.erl
OTP-12815
Diffstat (limited to 'lib/ssl/src/ssl_manager.erl')
0 files changed, 0 insertions, 0 deletions