diff options
| author | Zandra <[email protected]> | 2016-02-02 10:41:30 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2016-02-02 10:41:30 +0100 |
| commit | 1a6ec7c7eb20bb2b8300e7e59196c49ca63775b0 (patch) | |
| tree | 01d361559f79f86fb4a21688f1a3fca0d0051b20 /lib/ssl/src | |
| parent | 1e0d9d21e20d840ae9f7822bc956eca6c779412c (diff) | |
| parent | 0f15f90ef5f482b0e860e41438151a5d9c4859e7 (diff) | |
| download | otp-1a6ec7c7eb20bb2b8300e7e59196c49ca63775b0.tar.gz otp-1a6ec7c7eb20bb2b8300e7e59196c49ca63775b0.tar.bz2 otp-1a6ec7c7eb20bb2b8300e7e59196c49ca63775b0.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_tls_dist_proxy.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl index 080817d204..1e6c6e726a 100644 --- a/lib/ssl/src/ssl_tls_dist_proxy.erl +++ b/lib/ssl/src/ssl_tls_dist_proxy.erl @@ -89,6 +89,14 @@ listen_options(Opts0) -> Opts1 end. +connect_options(Opts) -> + case application:get_env(kernel, inet_dist_connect_options) of + {ok,ConnectOpts} -> + lists:ukeysort(1, ConnectOpts ++ Opts); + _ -> + Opts + end. + %%==================================================================== %% gen_server callbacks %%==================================================================== @@ -257,7 +265,7 @@ try_connect(Port) -> setup_proxy(Ip, Port, Parent) -> process_flag(trap_exit, true), - Opts = get_ssl_options(client), + Opts = connect_options(get_ssl_options(client)), case ssl:connect(Ip, Port, [{active, true}, binary, {packet,?PPRE}, nodelay()] ++ Opts) of {ok, World} -> {ok, ErtsL} = gen_tcp:listen(0, [{active, true}, {ip, {127,0,0,1}}, binary, {packet,?PPRE}]), |