diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-04-28 23:01:21 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-05-09 11:14:14 +0200 |
| commit | c80735b0c82ec0bbaa2e2bda4f1598210b193556 (patch) | |
| tree | bdca3c192b6441e1da1ecffe6a996482d889d352 /lib/ssl/src/tls_connection_sup.erl | |
| parent | 138bdae063206223bb35258780e0ec1b4301967b (diff) | |
| download | otp-c80735b0c82ec0bbaa2e2bda4f1598210b193556.tar.gz otp-c80735b0c82ec0bbaa2e2bda4f1598210b193556.tar.bz2 otp-c80735b0c82ec0bbaa2e2bda4f1598210b193556.zip | |
ssl: Handle socket option inheritance when pooling of accept sockets is used
Implement a listen socket tracker process that holds the emulated socket
options so that it is possible to implement a destructive ssl:setopts
on SSL/TLS listen sockets without changing the options of the internal
socket as we want that socket to have the internal socket option values.
Diffstat (limited to 'lib/ssl/src/tls_connection_sup.erl')
| -rw-r--r-- | lib/ssl/src/tls_connection_sup.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/tls_connection_sup.erl b/lib/ssl/src/tls_connection_sup.erl index 6f0d8a7262..7a637c212a 100644 --- a/lib/ssl/src/tls_connection_sup.erl +++ b/lib/ssl/src/tls_connection_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2013. All Rights Reserved. +%% Copyright Ericsson AB 2007-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -59,7 +59,7 @@ init(_O) -> StartFunc = {tls_connection, start_link, []}, Restart = temporary, % E.g. should not be restarted Shutdown = 4000, - Modules = [tls_connection], + Modules = [tls_connection, ssl_connection], Type = worker, ChildSpec = {Name, StartFunc, Restart, Shutdown, Type, Modules}, |