diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-11-14 10:32:52 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-11-14 10:32:52 +0100 |
| commit | 55c2b0b6d55fe6a011671832b5529cb1c7b636a8 (patch) | |
| tree | 9435b7399ebc479886fb11b98b26d57e3fc51e73 /lib/ssl/src/ssl.erl | |
| parent | 574b023712de7923d04e91e8919aabdcfb6232b8 (diff) | |
| parent | e2da23767faa83dd3ca10a191418942f931ebbcc (diff) | |
| download | otp-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/ssl/src/ssl.erl')
| -rw-r--r-- | lib/ssl/src/ssl.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl index 40d933a256..69e8d868fa 100644 --- a/lib/ssl/src/ssl.erl +++ b/lib/ssl/src/ssl.erl @@ -782,10 +782,10 @@ internal_inet_values() -> socket_options(InetValues) -> #socket_options{ - mode = proplists:get_value(mode, InetValues), - header = proplists:get_value(header, InetValues), - active = proplists:get_value(active, InetValues), - packet = proplists:get_value(packet, InetValues), + mode = proplists:get_value(mode, InetValues, lists), + header = proplists:get_value(header, InetValues, 0), + active = proplists:get_value(active, InetValues, active), + packet = proplists:get_value(packet, InetValues, 0), packet_size = proplists:get_value(packet_size, InetValues) }. |