aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/io.c
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2013-03-07 09:17:28 +0100
committerIngela Anderton Andin <[email protected]>2013-03-07 09:17:28 +0100
commit57a33a31ca0fcb385dd899f4074310d0fbdefda4 (patch)
treef61e4b0448a150993ba996d4baa797dc3ddd5528 /erts/emulator/beam/io.c
parent5086c3eea85e1c4cb7e9463c4ca919a32e3cb21c (diff)
parent77162de4d1fc15731f8c9a518435db9fa864525f (diff)
downloadotp-57a33a31ca0fcb385dd899f4074310d0fbdefda4.tar.gz
otp-57a33a31ca0fcb385dd899f4074310d0fbdefda4.tar.bz2
otp-57a33a31ca0fcb385dd899f4074310d0fbdefda4.zip
Merge branch 'ia/ssl/npn-abbrivated/OTP-10909' into maint
* ia/ssl/npn-abbrivated/OTP-10909: ssl: Handle next protocol negotiation when reusing a session.
Diffstat (limited to 'erts/emulator/beam/io.c')
0 files changed, 0 insertions, 0 deletions