https://github.com/python/cpython/commit/3707dfaf45baf867f17bbbc78ccf2f0d13711dbd commit: 3707dfaf45baf867f17bbbc78ccf2f0d13711dbd branch: 2.7 author: Benjamin Peterson <benjamin at python.org> committer: GitHub <noreply at github.com> date: 2018年07月07日T15:48:07-07:00 summary: [2.7] closes bpo-34050: Fix link in SSL docs (GH-8173). (GH-8179) (cherry picked from commit 9c5ba097485c8c643b670acd4026f4382bc92f4b) Co-authored-by: Marcin Niemira <marcin at niemira.net> files: M Doc/library/ssl.rst M Misc/ACKS diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 2a5b8f6620c8..042103177230 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 - <https://wiki.openssl.org/index.php/Manual:Ciphers(1)#CIPHER_LIST_FORMAT>`_. + <https://www.openssl.org/docs/manmaster/man1/ciphers.html>`_. 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 - <https://wiki.openssl.org/index.php/Manual:Ciphers(1)#CIPHER_LIST_FORMAT>`_. + <https://www.openssl.org/docs/manmaster/man1/ciphers.html>`_. 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 7ec29fab3c72..835d36140350 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