Kaydet (Commit) 78b23ab6 authored tarafından Mariatta's avatar Mariatta Kaydeden (comit) GitHub

[3.6] Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS…

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

(cherry picked from commit d4069de5)
üst 750ff5f8
...@@ -610,13 +610,13 @@ Constants ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment