diff options
author | Ingela Anderton Andin <ingela@erlang.org> | 2018-07-06 11:14:25 +0200 |
---|---|---|
committer | Ingela Anderton Andin <ingela@erlang.org> | 2018-07-09 14:53:45 +0200 |
commit | a06549fbe59333347232c56093791c0075fcd150 (patch) | |
tree | 9452f97dd4a4caaec4bb539458ab43dcfed93df4 /lib/ssl/doc | |
parent | a409990bbe6bbe75be274161855e2f68a48100e6 (diff) | |
download | otp-a06549fbe59333347232c56093791c0075fcd150.tar.gz otp-a06549fbe59333347232c56093791c0075fcd150.tar.bz2 otp-a06549fbe59333347232c56093791c0075fcd150.zip |
ssl: Improve error handling
When doing ssl:controlling_process on a ssl socket that has not
performed the TLS/DTLS handshake that call will succeed even though
the documentation stated otherwise. However if some other ssl option
was incorrect the call would hang. Now {error, closed} will be
returned in the latter case, which is logical independent on if it
should succeed or not in the former case. The former case will continue
to succeed, as it is not dependent of the TLS/DTLS connection being
established, and the documentation is altered slightly to not
explicitly disallow it. If the TLS/DTLS connection later fails and
the socket mode is active, the new controlling process will be
notified as expected.
Diffstat (limited to 'lib/ssl/doc')
-rw-r--r-- | lib/ssl/doc/src/ssl.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index 6e124c3513..437510b54d 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -1516,9 +1516,9 @@ fun(srp, Username :: string(), UserState :: term()) -> to complete handshaking, that is, establishing the SSL/TLS/DTLS connection.</p> <warning> - <p>The socket returned can only be used with - <seealso marker="#handshake-2"> handshake/[2,3]</seealso>. - No traffic can be sent or received before that call.</p> + <p>Most API functions require that the TLS/DTLS + connection is established to work as expected. + </p> </warning> <p>The accepted socket inherits the options set for <c>ListenSocket</c> in |