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

Fixing keep-alive #406

Merged
merged 8 commits into from
Jun 11, 2015
Merged

Fixing keep-alive #406

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3d5081
Adding connections to the pool after creation
gabtremblay Jun 5, 2015
79bca47
Fixing tests
gabtremblay Jun 8, 2015
04458ea
Merge remote-tracking branch 'upstream/master'
gabtremblay Jun 8, 2015
f2c8c17
Fixed cleanup and acquired connection management
gabtremblay Jun 9, 2015
5ceaa05
Cleanup unecessary edits + add contributor
gabtremblay Jun 9, 2015
3267c90
Fixed flake8 errors
gabtremblay Jun 9, 2015
41de52e
Fixed indentation bug
gabtremblay Jun 9, 2015
5bd081b
Added fiunctional keep-alive tests against aiohttp.web server
gabtremblay Jun 10, 2015
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
Fixed indentation bug
  • Loading branch information
@gabtremblay
gabtremblay committed Jun 9, 2015
commit 41de52e30f516dfa84da958187af05c92f88c694
4 changes: 2 additions & 2 deletions aiohttp/connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@ def connect(self, req):
if self._conns.get(key, None) is None:
self._conns[key] = []

self._conns[key].append((transport, proto,
self._loop.time()))
self._conns[key].append((transport, proto,
self._loop.time()))
except asyncio.TimeoutError as exc:
raise ClientTimeoutError(
'Connection timeout to host %s:%s ssl:%s' % key) from exc
Expand Down