From c2180b0e570baf90cbf567381212bb223fc73d37 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 8 Sep 2017 17:01:45 +0200
Subject: Rewrite dist ctrl from port to process

---
 lib/ssl/src/ssl_dist_sup.erl | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'lib/ssl/src/ssl_dist_sup.erl')

diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl
index 690b896919..c241a9bced 100644
--- a/lib/ssl/src/ssl_dist_sup.erl
+++ b/lib/ssl/src/ssl_dist_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -46,8 +46,7 @@ start_link() ->
 init([]) ->    
     AdminSup = ssl_admin_child_spec(),
     ConnectionSup = ssl_connection_sup(),
-    ProxyServer = proxy_server_child_spec(),
-    {ok, {{one_for_all, 10, 3600}, [AdminSup, ProxyServer, ConnectionSup]}}.
+    {ok, {{one_for_all, 10, 3600}, [AdminSup, ConnectionSup]}}.
 
 %%--------------------------------------------------------------------
 %%% Internal functions
@@ -69,12 +68,3 @@ ssl_connection_sup() ->
     Modules = [ssl_connection_sup],
     Type = supervisor,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-
-proxy_server_child_spec() ->
-    Name = ssl_tls_dist_proxy,  
-    StartFunc = {ssl_tls_dist_proxy, start_link, []},
-    Restart = permanent, 
-    Shutdown = 4000,
-    Modules = [ssl_tls_dist_proxy],
-    Type = worker,
-    {Name, StartFunc, Restart, Shutdown, Type, Modules}.
-- 
cgit v1.2.3