diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-10-23 11:08:43 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-10-23 11:08:43 +0200 |
| commit | 83f2ad6af98df7d7e0b744fcc775a64af1be5f4c (patch) | |
| tree | 011d651826b13dc8dc359d051c5efbe67f037fd7 /lib/ssl | |
| parent | 4605add58c00f2ed1b97972586d1fec9e0a80880 (diff) | |
| parent | 016c090de0ac94de4c359536d3232555379755ba (diff) | |
| download | otp-83f2ad6af98df7d7e0b744fcc775a64af1be5f4c.tar.gz otp-83f2ad6af98df7d7e0b744fcc775a64af1be5f4c.tar.bz2 otp-83f2ad6af98df7d7e0b744fcc775a64af1be5f4c.zip | |
Merge branch 'maint'
Conflicts:
lib/ssl/src/inet_tls_dist.erl
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/inet_tls_dist.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl index d644cbe66a..96782dcfc0 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -360,7 +360,7 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) -> Opts = trace(connect_options(get_ssl_options(client))), dist_util:reset_timer(Timer), case ssl:connect( - Ip, TcpPort, + Address, TcpPort, [binary, {active, false}, {packet, 4}, Driver:family(), nodelay()] ++ Opts, net_kernel:connecttime()) of |