From 5f48fab63cf0f5dd6fd70f269f4cd913dc62329a Mon Sep 17 00:00:00 2001 From: Marcin Niemira Date: Sun, 8 Jul 2018 00:24:20 +0200 Subject: [PATCH] [2.7] closes bpo-34050: Fix link in SSL docs (GH-8173). (cherry picked from commit 9c5ba097485c8c643b670acd4026f4382bc92f4b) Co-authored-by: Marcin Niemira --- Doc/library/ssl.rst | 4 ++-- Misc/ACKS | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 2a5b8f6620c8ca..04210317723045 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -214,7 +214,7 @@ instead. The *ciphers* parameter sets the available ciphers for this SSL object. It should be a string in the `OpenSSL cipher list format - `_. + `_. The parameter ``do_handshake_on_connect`` specifies whether to do the SSL handshake automatically after doing a :meth:`socket.connect`, or whether the @@ -1170,7 +1170,7 @@ to speed up repeated connections from the same clients. Set the available ciphers for sockets created with this context. It should be a string in the `OpenSSL cipher list format - `_. + `_. If no cipher can be selected (because compile-time options or other configuration forbids use of all the specified ciphers), an :class:`SSLError` will be raised. diff --git a/Misc/ACKS b/Misc/ACKS index 7ec29fab3c72ef..835d36140350fa 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -1565,6 +1565,7 @@ Gordon Worley Darren Worrall Thomas Wouters Daniel Wozniak +Marcin Niemira Heiko Wundram Doug Wyatt Xiang Zhang