bpo-24334: Cleanup SSLSocket #5252
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tiran
force-pushed
the
bpo-24334-simplify-sslsocket
branch
from
4ce6638 to
76b519c
Compare
pitrou
reviewed
Jan 21, 2018
Modules/_ssl.c
Outdated
| @@ -2309,19 +2323,21 @@ _ssl._SSLSocket.shutdown | |||
|
|
|||
| Does the SSL shutdown handshake with the remote end. | |||
|
|
|||
| Returns the underlying socket object. | |||
| Mode 0 is quiet shutdown, which does not send any CLOSE NOTIFY. Mode 2 | |||
There was a problem hiding this comment.
What do "mode 0" and "mode 2" refer to?
Lib/ssl.py
Outdated
| return self._sslobj.pending() | ||
| else: | ||
| return 0 | ||
|
|
||
| def shutdown(self, how): | ||
| self._checkClosed() | ||
| self._sslobj = None | ||
| if self._sslobj is not None: |
There was a problem hiding this comment.
Not sure the redundancy adds something here?
tiran
force-pushed
the
bpo-24334-simplify-sslsocket
branch
from
76b519c to
7f303a7
Compare
|
@pitrou I have addressed your review comments. Both places are remnants of another patch to implement more shutdown methods. I have removed them from this PR. https://bugs.python.org/issue27815#msg310403 explains the additional shutdown methods. I decided to move new shutdown methods to another PR and get this PR out before beta1. |
tiran
force-pushed
the
bpo-24334-simplify-sslsocket
branch
from
7f303a7 to
2a4f5d2
Compare
tiran
force-pushed
the
bpo-24334-simplify-sslsocket
branch
from
2a4f5d2 to
f4af45c
Compare
* The SSLSocket is no longer implemented on top of SSLObject to avoid an extra level of indirection. * Owner and session are now handled in the internal constructor. * _ssl._SSLSocket now uses the same method names as SSLSocket and SSLObject. * Channel binding type check is now handled in C code. Channel binding is always available. The patch also changes the signature of SSLObject.__init__(). In my opinion it's fine. A SSLObject is not a user-constructable object. SSLContext.wrap_bio() is the only valid factory.
tiran
force-pushed
the
bpo-24334-simplify-sslsocket
branch
from
f4af45c to
9a5cfc5
Compare
|
Thanks @tiran for the PR 🌮🎉.. I'm working now to backport this PR to: 3.7. |
|
@tiran: Please replace |
miss-islington
pushed a commit
to miss-islington/cpython
that referenced
this pull request
Feb 24, 2018
* The SSLSocket is no longer implemented on top of SSLObject to avoid an extra level of indirection. * Owner and session are now handled in the internal constructor. * _ssl._SSLSocket now uses the same method names as SSLSocket and SSLObject. * Channel binding type check is now handled in C code. Channel binding is always available. The patch also changes the signature of SSLObject.__init__(). In my opinion it's fine. A SSLObject is not a user-constructable object. SSLContext.wrap_bio() is the only valid factory. (cherry picked from commit 141c5e8) Co-authored-by: Christian Heimes <[email protected]>
|
GH-5857 is a backport of this pull request to the 3.7 branch. |
tiran
added a commit
that referenced
this pull request
Feb 24, 2018
* The SSLSocket is no longer implemented on top of SSLObject to avoid an extra level of indirection. * Owner and session are now handled in the internal constructor. * _ssl._SSLSocket now uses the same method names as SSLSocket and SSLObject. * Channel binding type check is now handled in C code. Channel binding is always available. The patch also changes the signature of SSLObject.__init__(). In my opinion it's fine. A SSLObject is not a user-constructable object. SSLContext.wrap_bio() is the only valid factory. (cherry picked from commit 141c5e8) Co-authored-by: Christian Heimes <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
avoid an extra level of indirection.
SSLObject.
is always available.
The patch also changes the signature of SSLObject.init(). In my
opinion it's fine. A SSLObject is not a user-constructable object.
SSLContext.wrap_bio() is the only valid factory.
https://bugs.python.org/issue24334