Skip to content

bpo-22559: Implementation of the PEP 546: Backport MemoryBIO #2133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vstinner wants to merge 9 commits into from
Closed

bpo-22559: Implementation of the PEP 546: Backport MemoryBIO #2133

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2671297
bpo-22559: Backport MemoryBIO
vstinner Jun 12, 2017
df550ad
Update ssl.py from master
vstinner Jun 12, 2017
6c0eab9
Address Alex Gaynor and my own comments
vstinner Jul 5, 2017
6332c11
Merge branch '2.7' into memorybio27
vstinner Jul 21, 2017
f9fe9a9
test_ssl: Replace svn.python.org with REMOTE_HOST
vstinner Jul 21, 2017
95c40cc
Oops, remove duplicated documentation
vstinner Jul 21, 2017
1d71c25
Merge branch '2.7' into memorybio27
vstinner Sep 8, 2017
980b3f3
Replace CRYPTO_add() with BIO_up_ref() for OpenSSL 1.1
vstinner Sep 8, 2017
d52ab10
Add NEWS entry.
vstinner Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Oops, remove duplicated documentation
  • Loading branch information
@vstinner
vstinner committed Jul 21, 2017
commit 95c40ccbb88d2abe886e12033e3cc3e1ad10db70
16 changes: 0 additions & 16 deletions Doc/library/ssl.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,22 +1065,6 @@ SSL sockets also have the following additional methods and attributes:

.. versionadded:: 2.7.9

.. attribute:: SSLSocket.server_hostname

A ``bytes`` instance containing the ``'idna'`` encoded version of the
hostname specified in the *server_hostname* argument in
:meth:`SSLContext.wrap_socket`. If no *server_hostname* was specified, this
attribute will be ``None``.

.. versionadded:: 2.7.9

.. attribute:: SSLSocket.server_side

A boolean which is ``True`` for server-side sockets and ``False`` for
client-side sockets.

.. versionadded:: 2.7.9

.. attribute:: SSLSocket.server_hostname

Hostname of the server: :class:`str` type, or ``None`` for server-side
Expand Down