NotificationsYou must be signed in to change notification settings
Fork33.7k
Star70.4k

[3.12] GH-113214: Fix SSLProto exception handling in SSL-over-SSL scenarios (GH-113334)#113339

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.

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

Already on GitHub?Sign in to your account

Jump to bottom

Merged

gvanrossum merged 1 commit intopython:3.12frommiss-islington:backport-1ff0238-3.12

Dec 21, 2023

Merged

[3.12] GH-113214: Fix SSLProto exception handling in SSL-over-SSL scenarios (GH-113334)#113339

gvanrossum merged 1 commit intopython:3.12frommiss-islington:backport-1ff0238-3.12

Dec 21, 2023

Conversation

Copy link

Contributor

miss-islington commentedDec 20, 2023•
edited by bedevere-appbot
Loading

When wrapped,_SSLProtocolTransport._force_close(exc) is called just like in the unwrapped scenario_SelectorTransport._force_close(exc) or_ProactorBasePipeTransport._force_close(exc) would be called, except here the exception needs to be passed through theSSLProtocol._abort() method, which didn't accept an exception object.

This commit ensures that this path works, in the same way that the uvloop implementation of SSLProto passes on the exception (on which the current implementation of SSLProto is based).
(cherry picked from commit1ff0238)

Co-authored-by: Martijn Pietersmj@zopatista.com

Issue:asyncio.sslproto.SSLProtocol exception handling triggers TypeError: SSLProtocol._abort() takes 1 positional argument but 2 were given #113214

pythonGH-113214: Fix SSLProto exception handling in SSL-over-SSL scen…

309e699

…arios (pythonGH-113334)When wrapped, `_SSLProtocolTransport._force_close(exc)` is called just like in the unwrapped scenario `_SelectorTransport._force_close(exc)` or `_ProactorBasePipeTransport._force_close(exc)` would be called, except here the exception needs to be passed through the `SSLProtocol._abort()` method, which didn't accept an exception object.This commit ensures that this path works, in the same way that the uvloop implementation of SSLProto passes on the exception (on which the current implementation of SSLProto is based).(cherry picked from commit1ff0238)Co-authored-by: Martijn Pieters <mj@zopatista.com>