Skip to content

HTTP/2 support for tunnelled proxy cases. #2009

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
lovelydinosaur merged 5 commits into from
Jan 5, 2022
Merged

HTTP/2 support for tunnelled proxy cases. #2009

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e941d79
Cap upload chunk sizes
lovelydinosaur Nov 22, 2021
f7863e2
Use '.read' for file streaming, where possible
lovelydinosaur Nov 22, 2021
71aa1cd
Direct iteration should not apply chunk sizes
lovelydinosaur Nov 22, 2021
ebb9501
HTTP/2 support for proxies
lovelydinosaur Jan 5, 2022
659560f
Merge branch 'master' into http2-proxy-support
lovelydinosaur Jan 5, 2022
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
43 changes: 30 additions & 13 deletions httpx/_transports/default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,19 +138,36 @@ def __init__(
retries=retries,
)
else:
self._pool = httpcore.HTTPProxy(
proxy_url=httpcore.URL(
scheme=proxy.url.raw_scheme,
host=proxy.url.raw_host,
port=proxy.url.port,
target=proxy.url.raw_path,
),
proxy_headers=proxy.headers.raw,
ssl_context=ssl_context,
max_connections=limits.max_connections,
max_keepalive_connections=limits.max_keepalive_connections,
keepalive_expiry=limits.keepalive_expiry,
)
try:
self._pool = httpcore.HTTPProxy(
proxy_url=httpcore.URL(
scheme=proxy.url.raw_scheme,
host=proxy.url.raw_host,
port=proxy.url.port,
target=proxy.url.raw_path,
),
proxy_headers=proxy.headers.raw,
ssl_context=ssl_context,
max_connections=limits.max_connections,
max_keepalive_connections=limits.max_keepalive_connections,
keepalive_expiry=limits.keepalive_expiry,
http1=http1,
http2=http2,
)
except TypeError: # pragma: nocover
self._pool = httpcore.HTTPProxy(
proxy_url=httpcore.URL(
scheme=proxy.url.raw_scheme,
host=proxy.url.raw_host,
port=proxy.url.port,
target=proxy.url.raw_path,
),
proxy_headers=proxy.headers.raw,
ssl_context=ssl_context,
max_connections=limits.max_connections,
max_keepalive_connections=limits.max_keepalive_connections,
keepalive_expiry=limits.keepalive_expiry,
)

def __enter__(self: T) -> T: # Use generics for subclass support.
self._pool.__enter__()
Expand Down