aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2012-10-17 16:52:20 +0200
committerIngela Anderton Andin <[email protected]>2012-11-13 10:58:17 +0100
commit1d7a5e1302ab5ddf2ef42fd4b5f370c250e8d6cc (patch)
treea08e49ca515cc826d69fb0c364fccec87335a7af
parent135fdb3b1804089c5170c5995a9dae653a28f927 (diff)
downloadotp-1d7a5e1302ab5ddf2ef42fd4b5f370c250e8d6cc.tar.gz
otp-1d7a5e1302ab5ddf2ef42fd4b5f370c250e8d6cc.tar.bz2
otp-1d7a5e1302ab5ddf2ef42fd4b5f370c250e8d6cc.zip
ssl: Add default values to emulated socket options in internal record
The absence of the active default values could cause a process leak
-rw-r--r--lib/ssl/src/ssl.erl8
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)
}.