traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[3.6] Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition (GH-1355) (#1371) 

(cherry picked from commit d4069de511)
This commit is contained in:
Mariatta 2017-05-01 22:55:53 -07:00 committed by GitHub
parent 750ff5f8df
commit 78b23ab682
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/ssl.rst
View File

@ -610,13 +610,13 @@ Constants
.. data:: PROTOCOL_TLS .. data:: PROTOCOL_TLS
Selects the highest protocol version that both the client and server support. Selects the highest protocol version that both the client and server support.
Despite the name, this option can select "TLS" protocols as well as "SSL". Despite the name, this option can select both "SSL" and "TLS" protocols.
.. versionadded:: 3.6 .. versionadded:: 3.6
.. data:: PROTOCOL_TLS_CLIENT .. data:: PROTOCOL_TLS_CLIENT
Auto-negotiate the highest protocol version like :data:`PROTOCOL_SSLv23`, Auto-negotiate the highest protocol version like :data:`PROTOCOL_TLS`,
but only support client-side :class:`SSLSocket` connections. The protocol but only support client-side :class:`SSLSocket` connections. The protocol
enables :data:`CERT_REQUIRED` and :attr:`~SSLContext.check_hostname` by enables :data:`CERT_REQUIRED` and :attr:`~SSLContext.check_hostname` by
default. default.
@ -625,7 +625,7 @@ Constants
.. data:: PROTOCOL_TLS_SERVER .. data:: PROTOCOL_TLS_SERVER
Auto-negotiate the highest protocol version like :data:`PROTOCOL_SSLv23`, Auto-negotiate the highest protocol version like :data:`PROTOCOL_TLS`,
but only support server-side :class:`SSLSocket` connections. but only support server-side :class:`SSLSocket` connections.
.. versionadded:: 3.6 .. versionadded:: 3.6