diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-03-19 12:14:43 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-03-19 12:14:43 +0100 |
| commit | 8c1059c60f07e0acc916967be097a4e5ce15f2c4 (patch) | |
| tree | 7576c8251c1360e49001569bd2a5f9ff97a65c1c /erts/obj | |
| parent | 620ac3e68c5bc8b36143965fcf2892a07dc005c4 (diff) | |
| parent | 18e8014fe2afa454ed644a731f7ddf820b79bb16 (diff) | |
| download | otp-8c1059c60f07e0acc916967be097a4e5ce15f2c4.tar.gz otp-8c1059c60f07e0acc916967be097a4e5ce15f2c4.tar.bz2 otp-8c1059c60f07e0acc916967be097a4e5ce15f2c4.zip | |
Merge branch 'ingela/ssl/recv-timeout-bug/ERL-884/ERL-883/OTP-14701' into maint
* ingela/ssl/recv-timeout-bug/ERL-884/ERL-883/OTP-14701:
ssl: Cancel recv timer in all places
Diffstat (limited to 'erts/obj')
0 files changed, 0 insertions, 0 deletions