From 93c88fdc541c3f8a4ebbae3699bee90d00dc637f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 4 Jun 2018 08:40:31 +0200 Subject: Remove the dependency on Ranch We instead of two new modules, gun_tcp and gun_tls. They only have 6 functions so far, much less than what Ranch provided before. Also renames ssl to tls where applicable. It's still possible to use the ssl transport option but it's now undocumented. --- doc/src/manual/gun.asciidoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'doc/src/manual/gun.asciidoc') diff --git a/doc/src/manual/gun.asciidoc b/doc/src/manual/gun.asciidoc index b5ed039..b15ce09 100644 --- a/doc/src/manual/gun.asciidoc +++ b/doc/src/manual/gun.asciidoc @@ -149,7 +149,7 @@ opts() :: #{ retry => non_neg_integer(), retry_timeout => pos_integer(), trace => boolean(), - transport => tcp | ssl, + transport => tcp | tls, transport_opts => [gen_tcp:connect_option()] | [ssl:connect_option()], ws_opts => ws_opts() } @@ -175,11 +175,11 @@ protocols - see below:: Ordered list of preferred protocols. When the transport is `tcp`, this list must contain exactly one protocol. When the transport -is `ssl`, this list must contain at least one protocol and will be +is `tls`, this list must contain at least one protocol and will be used to negotiate a protocol via ALPN. When the server does not support ALPN then `http` will always be used. Defaults to `[http]` when the transport is `tcp`, and `[http2, http]` when the -transport is `ssl`. +transport is `tls`. retry (5):: @@ -196,12 +196,12 @@ only be used during debugging. transport - see below:: -Whether to use SSL or plain TCP. The default varies depending on the -port used. Port 443 defaults to `ssl`. All other ports default to `tcp`. +Whether to use TLS or plain TCP. The default varies depending on the +port used. Port 443 defaults to `tls`. All other ports default to `tcp`. transport_opts ([]):: -Transport options. They are TCP options or SSL options depending on +Transport options. They are TCP options or TLS options depending on the selected transport. ws_opts (#{}):: -- cgit v1.2.3