diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-01-23 22:30:26 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-01-23 22:30:26 (GMT) |
| commit | 8861502e0746465c4124548681f05969c08f4cae (patch) | |
| tree | f9755320ab144c6f965f09bea7c002dc063ba708 /Doc/library/ssl.rst | |
| parent | cca2732a8216bac0d6ca182fc5a55769af2c5160 (diff) | |
| download | cpython-8861502e0746465c4124548681f05969c08f4cae.zip cpython-8861502e0746465c4124548681f05969c08f4cae.tar.gz cpython-8861502e0746465c4124548681f05969c08f4cae.tar.bz2 | |
prefer server alpn ordering over the client's
Diffstat (limited to 'Doc/library/ssl.rst')
| -rw-r--r-- | Doc/library/ssl.rst | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 11b8aa9..e7cf425 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -970,7 +970,8 @@ SSL sockets also have the following additional methods and attributes: Return the protocol that was selected during the TLS handshake. If :meth:`SSLContext.set_alpn_protocols` was not called, if the other party does - not support ALPN, or if the handshake has not happened yet, ``None`` is + not support ALPN, if this socket does not support any of the client's + proposed protocols, or if the handshake has not happened yet, ``None`` is returned. .. versionadded:: 3.5 |