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
erlang · Nov 14, 2012 · 55c2b0b · 55c2b0b
2 parents 574b023 + e2da237
commit 55c2b0b
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 77 deletions.
diff --git 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)	     
 	       }.