aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2019-02-19 11:00:43 +0100
committerLoïc Hoguin <[email protected]>2019-02-19 11:00:43 +0100
commit59c1634e7972746ab3f144bbd65922bcb1d9c630 (patch)
tree810eed8f313050aef51714769c46896493197305 /lib
parent33a9c7d4c916996708694428f8b285f51c1256ff (diff)
downloadotp-59c1634e7972746ab3f144bbd65922bcb1d9c630.tar.gz
otp-59c1634e7972746ab3f144bbd65922bcb1d9c630.tar.bz2
otp-59c1634e7972746ab3f144bbd65922bcb1d9c630.zip
fixup! ssl: Add support for {active,N}
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/src/ssl_connection.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl
index 9e0b0a40c2..86b39a1712 100644
--- a/lib/ssl/src/ssl_connection.erl
+++ b/lib/ssl/src/ssl_connection.erl
@@ -542,7 +542,11 @@ read_application_data(
undefined, undefined)
end;
{more, Buffer} -> % no reply, we need more data
- {no_record, State#state{user_data_buffer = Buffer}};
+ {no_record,
+ State#state{
+ user_data_buffer = Buffer,
+ socket_options = SocketOpts0
+ }};
{passive, Buffer} ->
{no_record, State#state{user_data_buffer = Buffer}};
{error,_Reason} -> %% Invalid packet in packet mode
@@ -1260,7 +1264,8 @@ handle_call({set_opts, Opts0}, From, StateName,
#state{static_env = #static_env{socket = Socket,
transport_cb = Transport,
tracker = Tracker},
- user_application = {_Mon, Pid},
+ connection_env =
+ #connection_env{user_application = {_Mon, Pid}},
socket_options = Opts1
} = State0, Connection) ->
{Reply, Opts} = set_socket_opts(Connection, Transport, Socket, Opts0, Opts1, []),