Permalink
Browse files

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
  • Loading branch information...
2 parents 574b023 + e2da237 commit 55c2b0b6d55fe6a011671832b5529cb1c7b636a8 @IngelaAndin IngelaAndin committed Nov 14, 2012
Showing with 86 additions and 77 deletions.
  1. +4 −4 lib/ssl/src/ssl.erl
  2. +82 −73 lib/ssl/src/ssl_connection.erl
View
@@ -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)
}.
Oops, something went wrong.

0 comments on commit 55c2b0b

Please sign in to comment.