diff options
| author | Erlang/OTP <[email protected]> | 2019-03-18 18:02:32 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-03-18 18:02:32 +0100 |
| commit | 18940986f9539370efb6e3a2be53ec312c6445bf (patch) | |
| tree | 45438da8aa3dda125c4eee6efb3e8f5a61e84dff /erts/emulator/zlib/zutil.h | |
| parent | 7b4f3319aa8cbe242c5e0ad7ef9730a3727a1333 (diff) | |
| parent | 18e8014fe2afa454ed644a731f7ddf820b79bb16 (diff) | |
| download | otp-18940986f9539370efb6e3a2be53ec312c6445bf.tar.gz otp-18940986f9539370efb6e3a2be53ec312c6445bf.tar.bz2 otp-18940986f9539370efb6e3a2be53ec312c6445bf.zip | |
Merge branch 'ingela/ssl/recv-timeout-bug/ERL-884/ERL-883/OTP-14701' into maint-21
* ingela/ssl/recv-timeout-bug/ERL-884/ERL-883/OTP-14701:
ssl: Cancel recv timer in all places
Diffstat (limited to 'erts/emulator/zlib/zutil.h')
0 files changed, 0 insertions, 0 deletions