Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ConnectionResetError not being raised when the transport is closed #7180

Merged
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
eab15e3
Fix ConnectionResetError not being raised when the transport is closed
bdraco Jan 22, 2023
5a43af0
mypy
bdraco Jan 22, 2023
4a9da40
mypy
bdraco Jan 22, 2023
2da4064
add cover
bdraco Jan 22, 2023
8ac7f38
add cover
bdraco Jan 22, 2023
9cb25db
change
bdraco Jan 22, 2023
0c8b69a
contributors
bdraco Jan 22, 2023
3b90d3c
typo
bdraco Jan 22, 2023
f0ae99e
typo
bdraco Jan 22, 2023
4f44c32
typo
bdraco Jan 22, 2023
a393ece
single source of truth for the transport
bdraco Jan 23, 2023
8670f0a
preen
bdraco Jan 23, 2023
78273dd
empty
bdraco Jan 23, 2023
7f95175
empty
bdraco Jan 24, 2023
860fde8
rst syntax
bdraco Jan 27, 2023
d34fc70
Update aiohttp/http_writer.py
bdraco Jan 27, 2023
516a5c1
docstring
bdraco Jan 27, 2023
811e3e1
Merge remote-tracking branch 'bdraco/fix_connection_reset_error_not_r…
bdraco Jan 27, 2023
21bb53b
matches
bdraco Jan 27, 2023
c946e93
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 27, 2023
5833948
mocker
bdraco Jan 27, 2023
ded9608
Merge remote-tracking branch 'bdraco/fix_connection_reset_error_not_r…
bdraco Jan 27, 2023
0ff872e
fix incorrect kwarg
bdraco Jan 27, 2023
96090d5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 27, 2023
b93ed94
empty commit to rerun ci
bdraco Jan 27, 2023
043c1d4
Merge remote-tracking branch 'bdraco/fix_connection_reset_error_not_r…
bdraco Jan 27, 2023
05da43e
empty commit to rerun ci
bdraco Jan 27, 2023
4e10760
empty
bdraco Jan 27, 2023
90f4257
add connected property
bdraco Jan 28, 2023
471fa2e
cleanup
bdraco Jan 28, 2023
0172016
revert change to make mypy happy
bdraco Jan 28, 2023
d51d68a
revert change to make mypy happy
bdraco Jan 28, 2023
74b7e77
update tests
bdraco Jan 28, 2023
0f44ef2
still check for is_closing
bdraco Jan 28, 2023
a7e53ba
Update tests/test_client_proto.py
Dreamsorcerer Feb 1, 2023
ed76669
Update aiohttp/base_protocol.py
Dreamsorcerer Feb 1, 2023
53384ab
Update aiohttp/base_protocol.py
Dreamsorcerer Feb 1, 2023
115ce1d
Merge branch 'master' into fix_connection_reset_error_not_raised
Dreamsorcerer 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
Prev Previous commit
Next Next commit
single source of truth for the transport
bdraco committed Jan 23, 2023

Verified

This commit was signed with the committer’s verified signature.
frapell Franco Pellegrini
commit a393ecefdead54b170632259ededd66e665c849c
4 changes: 1 addition & 3 deletions aiohttp/http_writer.py
Original file line number Diff line number Diff line change
@@ -35,7 +35,6 @@ def __init__(
on_headers_sent: _T_OnHeadersSent = None,
) -> None:
self._protocol = protocol
self._transport = protocol.transport

self.loop = loop
self.length = None
@@ -52,7 +51,7 @@ def __init__(

@property
def transport(self) -> Optional[asyncio.Transport]:
return self._transport
return self._protocol.transport

@property
def protocol(self) -> BaseProtocol:
@@ -166,7 +165,6 @@ async def write_eof(self, chunk: bytes = b"") -> None:
await self.drain()

self._eof = True
self._transport = None

async def drain(self) -> None:
"""Flush the write buffer.
15 changes: 15 additions & 0 deletions tests/test_client_proto.py
Original file line number Diff line number Diff line change
@@ -136,3 +136,18 @@ async def test_eof_received(loop: Any) -> None:
assert proto._read_timeout_handle is not None
proto.eof_received()
assert proto._read_timeout_handle is None


async def test_connection_lost_sets_transport_to_none(loop: Any) -> None:
"""Ensure that the transport is set to None when the connection is list.
Dreamsorcerer marked this conversation as resolved.
Show resolved Hide resolved

This ensures the writer knows that the connection is closed.
"""
proto = ResponseHandler(loop=loop)
transport = mock.Mock()
bdraco marked this conversation as resolved.
Show resolved Hide resolved
proto.connection_made(transport)
assert proto.transport is not None

proto.connection_lost(OSError())

assert proto.transport is None