aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/src/pubkey_pem.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-11-14 10:32:52 +0100
committerIngela Anderton Andin <[email protected]>2012-11-14 10:32:52 +0100
commit55c2b0b6d55fe6a011671832b5529cb1c7b636a8 (patch)
tree9435b7399ebc479886fb11b98b26d57e3fc51e73 /lib/public_key/src/pubkey_pem.erl
parent574b023712de7923d04e91e8919aabdcfb6232b8 (diff)
parente2da23767faa83dd3ca10a191418942f931ebbcc (diff)
downloadotp-55c2b0b6d55fe6a011671832b5529cb1c7b636a8.tar.gz
otp-55c2b0b6d55fe6a011671832b5529cb1c7b636a8.tar.bz2
otp-55c2b0b6d55fe6a011671832b5529cb1c7b636a8.zip
Merge branch 'ia/ssl/terminate-handling/OTP-10574' into maint
* ia/ssl/terminate-handling/OTP-10574: ssl: Make sure that the ssl connection process will not hang in terminate function. ssl: Add default values to emulated socket options in internal record
Diffstat (limited to 'lib/public_key/src/pubkey_pem.erl')
0 files changed, 0 insertions, 0 deletions