summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-11-24 02:13:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-11-24 02:13:31 (GMT)
commit31aa69ead58c53ef670ae45debbcd07e3c099d0b (patch)
treec357bb434acd1d6e39b6a6e70243071244afb3d0 /Doc
parent88922db77568ead498631379ff87c07a22529b7f (diff)
downloadcpython-31aa69ead58c53ef670ae45debbcd07e3c099d0b.zip
cpython-31aa69ead58c53ef670ae45debbcd07e3c099d0b.tar.gz
cpython-31aa69ead58c53ef670ae45debbcd07e3c099d0b.tar.bz2
allow hostname to be passed to SSLContext even if OpenSSL doesn't support SNI (closes #22921)
Patch from Donald Stufft.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/ssl.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index c52b073..0674cdf 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -645,8 +645,7 @@ Constants
.. data:: HAS_SNI
Whether the OpenSSL library has built-in support for the *Server Name
- Indication* extension (as defined in :rfc:`4366`). When true, you can
- use the *server_hostname* argument to :meth:`SSLContext.wrap_socket`.
+ Indication* extension (as defined in :rfc:`4366`).
.. versionadded:: 2.7.9
@@ -1136,11 +1135,12 @@ to speed up repeated connections from the same clients.
On client connections, the optional parameter *server_hostname* specifies
the hostname of the service which we are connecting to. This allows a
single server to host multiple SSL-based services with distinct certificates,
- quite similarly to HTTP virtual hosts. Specifying *server_hostname*
- will raise a :exc:`ValueError` if the OpenSSL library doesn't have support
- for it (that is, if :data:`HAS_SNI` is :const:`False`). Specifying
- *server_hostname* will also raise a :exc:`ValueError` if *server_side*
- is true.
+ quite similarly to HTTP virtual hosts. Specifying *server_hostname* will
+ raise a :exc:`ValueError` if *server_side* is true.
+
+ .. versionchanged:: 3.5
+ Always allow a server_hostname to be passed, even if OpenSSL does not
+ have SNI.
.. method:: SSLContext.session_stats()