Skip to content

Commit c85bfba

Browse files
javabrettbenoitc
authored andcommitted
Fixed typo in ssl_version doc, TLSv2 -> TLSv1_2 (TLS 1.2). (#1959)
* Fixed typo in ssl_version doc, TLSv2 -> TLSv1_2 (TLS 1.2). Signed-off-by: Brett Randall <[email protected]> * revert chdir change
1 parent ba0d784 commit c85bfba

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

docs/source/settings.rst

+19-1
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,29 @@ ssl_version
436436
* ``--ssl-version``
437437
* ``_SSLMethod.PROTOCOL_TLS``
438438

439-
SSL version to use (see stdlib ssl module's)
439+
SSL version to use.
440+
441+
============= ============
442+
--ssl-version Description
443+
============= ============
444+
SSLv3 SSLv3 is not-secure and is strongly discouraged.
445+
SSLv23 Alias for TLS. Deprecated in Python 3.6, use TLS.
446+
TLS Negotiate highest possible version between client/server.
447+
Can yield SSL. (Python 3.6+)
448+
TLSv1 TLS 1.0
449+
TLSv1_1 TLS 1.1 (Python 3.4+)
450+
TLSv1_2 TLS 1.2 (Python 3.4+)
451+
TLS_SERVER Auto-negotiate the highest protocol version like TLS,
452+
but only support server-side SSLSocket connections.
453+
(Python 3.6+)
454+
============= ============
440455

441456
.. versionchanged:: 19.7
442457
The default value has been changed from ``ssl.PROTOCOL_TLSv1`` to
443458
``ssl.PROTOCOL_SSLv23``.
459+
.. versionchanged:: 20.0
460+
This setting now accepts string names based on ``ssl.PROTOCOL_``
461+
constants.
444462

445463
.. _cert-reqs:
446464

gunicorn/config.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1900,10 +1900,11 @@ class SSLVersion(Setting):
19001900
Can yield SSL. (Python 3.6+)
19011901
TLSv1 TLS 1.0
19021902
TLSv1_1 TLS 1.1 (Python 3.4+)
1903-
TLSv2 TLS 1.2 (Python 3.4+)
1903+
TLSv1_2 TLS 1.2 (Python 3.4+)
19041904
TLS_SERVER Auto-negotiate the highest protocol version like TLS,
19051905
but only support server-side SSLSocket connections.
19061906
(Python 3.6+)
1907+
============= ============
19071908
19081909
.. versionchanged:: 19.7
19091910
The default value has been changed from ``ssl.PROTOCOL_TLSv1`` to

0 commit comments

Comments
 (0)