From 59c1634e7972746ab3f144bbd65922bcb1d9c630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Tue, 19 Feb 2019 11:00:43 +0100
Subject: fixup! ssl: Add support for {active,N}

---
 lib/ssl/src/ssl_connection.erl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'lib/ssl')

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, []),
-- 
cgit v1.2.3