diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-03-31 22:10:03 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-03-31 22:10:03 +0200 |
| commit | 9894c51f3be4362a4d5edc05bf7e977a5e16bd26 (patch) | |
| tree | 76aeff18c6f0b1f19ff91776779dd53077f7a310 /lib/ssl/src/ssl_internal.hrl | |
| parent | 3817722d82b5ca2bdc880bb5f463a94c382eddaa (diff) | |
| parent | 396ec26494008e18b573707986e32733e468346d (diff) | |
| download | otp-9894c51f3be4362a4d5edc05bf7e977a5e16bd26.tar.gz otp-9894c51f3be4362a4d5edc05bf7e977a5e16bd26.tar.bz2 otp-9894c51f3be4362a4d5edc05bf7e977a5e16bd26.zip | |
Merge branch 'ia/ssl/accept-with-options'
* ia/ssl/accept-with-options:
ssl: Add possibility to specify ssl options when calling ssl:ssl_accept
Diffstat (limited to 'lib/ssl/src/ssl_internal.hrl')
| -rw-r--r-- | lib/ssl/src/ssl_internal.hrl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_internal.hrl b/lib/ssl/src/ssl_internal.hrl index cec5d8fbb1..8bf5b30a83 100644 --- a/lib/ssl/src/ssl_internal.hrl +++ b/lib/ssl/src/ssl_internal.hrl @@ -101,7 +101,6 @@ reuse_sessions :: boolean(), renegotiate_at, secure_renegotiate, - debug, %% undefined if not hibernating, or number of ms of %% inactivity after which ssl_connection will go into %% hibernation |