diff options
| author | Erlang/OTP <[email protected]> | 2012-12-06 14:49:31 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2012-12-06 14:49:31 +0100 |
| commit | 2067c7c77d74b715c77648b37517a06e163c4b6b (patch) | |
| tree | a92a91598fb11846fe422aed017ee53753ae8db3 /lib/os_mon | |
| parent | d5de2e1ffd6403f5d7ec62e6ce8da508e1cb1239 (diff) | |
| parent | 51e291fe0ae69412ee3d2cbde768c92e3f239a2f (diff) | |
| download | otp-2067c7c77d74b715c77648b37517a06e163c4b6b.tar.gz otp-2067c7c77d74b715c77648b37517a06e163c4b6b.tar.bz2 otp-2067c7c77d74b715c77648b37517a06e163c4b6b.zip | |
Merge branch 'egil/ia/ssl/accept-timeout/OTP-10600' into maint-r15
* egil/ia/ssl/accept-timeout/OTP-10600:
ssl: Prepare for release
ssl: Export sslsocket() dialyzer type
ssl: Cancel non expired timers
ssl: Fix recv after timeout expired
ssl: Timeout handling changed so that the fsm-process will terminate if the ssl:ssl_accept/[2,3] or ssl:connect/[3,4] timeout expires.
Diffstat (limited to 'lib/os_mon')
0 files changed, 0 insertions, 0 deletions