diff options
| -rw-r--r-- | guide/listeners.md | 10 | ||||
| -rw-r--r-- | test/acceptor_SUITE.erl | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/guide/listeners.md b/guide/listeners.md index 48ec622..32fddde 100644 --- a/guide/listeners.md +++ b/guide/listeners.md @@ -118,15 +118,15 @@ Accepting connections on an existing socket If you want to accept connections on an existing socket, you can use the `socket` transport option, which should just be the relevant data returned -from the connect() function for the undelying socket library -(gen_tcp:connect(), ssl:connect()). accept() will be then be called on the -passed in socket. You should connect() the socket in {active, false} mode, as -well. +from the connect function for the transport or the underlying socket library +(`gen_tcp:connect`, `ssl:connect`). The accept function will then be +called on the passed in socket. You should connect the socket in +`{active, false}` mode, as well. Note, however, that because of a bug in SSL, you cannot change ownership of an SSL listen socket prior to R16. Ranch will catch the error thrown, but the owner of the SSL socket will remain as whatever process created the socket. -However, this will not affect accept() behaviour unless the owner process dies, +However, this will not affect accept behaviour unless the owner process dies, in which case the socket is closed. Therefore, to use this feature with SSL with an erlang release prior to R16, ensure that the SSL socket is opened in a persistant process. diff --git a/test/acceptor_SUITE.erl b/test/acceptor_SUITE.erl index 5e8d9cf..59513ab 100644 --- a/test/acceptor_SUITE.erl +++ b/test/acceptor_SUITE.erl @@ -48,17 +48,17 @@ all() -> groups() -> [{tcp, [ + tcp_accept_socket, tcp_active_echo, tcp_echo, tcp_max_connections, tcp_max_connections_and_beyond, - tcp_upgrade, - tcp_accept_socket + tcp_upgrade ]}, {ssl, [ ssl_accept_error, + ssl_accept_socket, ssl_active_echo, - ssl_echo, - ssl_accept_socket + ssl_echo ]}, {misc, [ misc_bad_transport ]}]. |