Skip to content

gh-101317: Add ssl_shutdown_timeout parameter for StreamWriter.start_tls() #101335

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

Merged
kumaraditya303 merged 6 commits into from
Feb 1, 2023
Merged

gh-101317: Add ssl_shutdown_timeout parameter for StreamWriter.start_tls() #101335

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad0dbba
gh-101317: Add ssl_shutdown_timeout parameter for StreamWriter.start_…
beavailable Jan 26, 2023
44dcb5a
📜🤖 Added by blurb_it.
blurb-it[bot] Jan 26, 2023
19b6e9a
Add Docs
beavailable Feb 1, 2023
a892d51
Update Misc/NEWS.d/next/Library/2023-01-26-01-25-56.gh-issue-101317.v…
kumaraditya303 Feb 1, 2023
218a421
Merge branch 'main' into fix-issue-101317
kumaraditya303 Feb 1, 2023
e5da8f0
Update Misc/NEWS.d/next/Library/2023-01-26-01-25-56.gh-issue-101317.v…
kumaraditya303 Feb 1, 2023
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
Next Next commit
gh-101317: Add ssl_shutdown_timeout parameter for StreamWriter.start_… 
…tls()
  • Loading branch information
@beavailable
beavailable committed Jan 26, 2023
commit ad0dbba018c83c0643c131e1095aa9fb3257049b
6 changes: 4 additions & 2 deletions Lib/asyncio/streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,15 +378,17 @@ async def drain(self):

async def start_tls(self, sslcontext, *,
server_hostname=None,
ssl_handshake_timeout=None):
ssl_handshake_timeout=None,
ssl_shutdown_timeout=None):
"""Upgrade an existing stream-based connection to TLS."""
server_side = self._protocol._client_connected_cb is not None
protocol = self._protocol
await self.drain()
new_transport = await self._loop.start_tls( # type: ignore
self._transport, protocol, sslcontext,
server_side=server_side, server_hostname=server_hostname,
ssl_handshake_timeout=ssl_handshake_timeout)
ssl_handshake_timeout=ssl_handshake_timeout,
ssl_shutdown_timeout=ssl_shutdown_timeout)
self._transport = new_transport
protocol._replace_writer(self)

Expand Down