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.

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

Close the socket if there's a failure in start_connection() #10464

Merged
merged 9 commits into from
Feb 20, 2025
Merged

Close the socket if there's a failure in start_connection() #10464

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8221b09
Close the socket if there's a failure in start_connection()
top-oai Feb 14, 2025
2d1989d
Update start_connection mock to return a mocked socket
top-oai Feb 16, 2025
e3857e4
Fix proxy test.
top-oai Feb 16, 2025
8af0f24
Add sock.close() test.
top-oai Feb 16, 2025
d9ae936
Add a comment.
top-oai Feb 16, 2025
5a8afa5
Doc changes
top-oai Feb 16, 2025
6abaae7
Review comments -- add author to changes
top-oai Feb 18, 2025
2d0d4ab
review feedback -- combine with clauses
top-oai Feb 18, 2025
b3fcd38
review feedback -- add explicit typing
top-oai Feb 18, 2025
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
10 changes: 9 additions & 1 deletion aiohttp/connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,6 +1101,7 @@ async def _wrap_create_connection(
client_error: Type[Exception] = ClientConnectorError,
**kwargs: Any,
) -> Tuple[asyncio.Transport, ResponseHandler]:
sock = None
try:
async with ceil_timeout(
timeout.sock_connect, ceil_threshold=timeout.ceil_threshold
Expand All @@ -1112,7 +1113,11 @@ async def _wrap_create_connection(
interleave=self._interleave,
loop=self._loop,
)
return await self._loop.create_connection(*args, **kwargs, sock=sock)
connection = await self._loop.create_connection(
*args, **kwargs, sock=sock
)
sock = None
return connection
except cert_errors as exc:
raise ClientConnectorCertificateError(req.connection_key, exc) from exc
except ssl_errors as exc:
Expand All @@ -1121,6 +1126,9 @@ async def _wrap_create_connection(
if exc.errno is None and isinstance(exc, asyncio.TimeoutError):
raise
raise client_error(req.connection_key, exc) from exc
finally:
if sock is not None:
sock.close()

def _warn_about_tls_in_tls(
self,
Expand Down
Loading