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

Add httpx.SSLContext configuration. #3022

Merged
merged 43 commits into from
Oct 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
88f2ab7
Add ssl_context argument
karpetrosyan Dec 25, 2023
58e9fdc
Use default ciphers and set minimum tls version to 1.2
karpetrosyan Dec 25, 2023
1afe2c9
Merge branch 'master' into add-ssl-context-argument
karpetrosyan Dec 28, 2023
6be802e
Fix init_proxy_transport arguments
karpetrosyan Dec 28, 2023
d124d8f
Merge branch 'master' into add-ssl-context-argument
karpetrosyan Dec 28, 2023
6f1162b
Use __init__ instead of __new__ in SSLContext
karpetrosyan Dec 29, 2023
f613dee
Merge branch 'master' into add-ssl-context-argument
karpetrosyan Jan 5, 2024
55ec002
Merge branch 'master' into add-ssl-context-argument
tomchristie Jan 15, 2024
7346bc2
Merge branch 'master' into add-ssl-context-argument
karpetrosyan Jan 16, 2024
7f35134
Docs
karpetrosyan Jan 16, 2024
8d5983a
Fix SSLContext repr
karpetrosyan Jan 16, 2024
f759dec
Merge branch 'master' into add-ssl-context-argument
karpetrosyan Jan 16, 2024
7227573
Merge branch 'master' into add-ssl-context-argument
tomchristie Mar 1, 2024
0567aab
Merge branch 'master' into add-ssl-context-argument
tomchristie Mar 1, 2024
2d79640
Fixes to merge master
tomchristie Mar 1, 2024
4d84953
comma
tomchristie Mar 1, 2024
df7bf31
Update _client.py
tomchristie Mar 1, 2024
93ca75f
Update _config.py
tomchristie Mar 1, 2024
2b7cf9e
Update _config.py
tomchristie Mar 1, 2024
fa065dd
Merge branch 'master' into add-ssl-context-argument
tomchristie May 8, 2024
f09a823
Merge branch 'master' into add-ssl-context-argument
karpetrosyan May 17, 2024
4eba150
Merge branch 'master' of github.com:encode/httpx into add-ssl-context…
karpetrosyan Sep 4, 2024
f3b1dc7
Merge branch 'master' into add-ssl-context-argument
karpetrosyan Sep 22, 2024
998f445
Merge branch 'master' into add-ssl-context-argument
tomchristie Sep 23, 2024
a08ff77
Update docs/advanced/ssl.md
karpetrosyan Sep 23, 2024
827ae5b
Merge branch 'master' into add-ssl-context-argument
tomchristie Sep 26, 2024
b3673bd
Tidy up ssl configuration process
karpetrosyan Sep 26, 2024
d3a8aab
Merge branch 'version-1.0' of github.com:encode/httpx into add-ssl-co…
karpetrosyan Sep 26, 2024
808a891
changelog
karpetrosyan Sep 26, 2024
289cf9c
Revert SSLKEYLOGFILE change
karpetrosyan Sep 28, 2024
6a85f2c
Add a test for SSLKEYLOGFILE
karpetrosyan Sep 28, 2024
d235e76
Fix the contributing docs
karpetrosyan Sep 28, 2024
1a79bd9
Update tests/test_config.py
karpetrosyan Oct 4, 2024
3f9aaa8
Fix ssl_context annotations
karpetrosyan Oct 4, 2024
46268b7
Update .github/CONTRIBUTING.md
karpetrosyan Oct 4, 2024
26de9d0
Update docs/advanced/ssl.md
karpetrosyan Oct 4, 2024
49545bb
Update docs/advanced/ssl.md
tomchristie Oct 4, 2024
01bb388
Update CHANGELOG.md
tomchristie Oct 6, 2024
13cb957
Apply suggestions from code review
tomchristie Oct 7, 2024
51ec619
Apply suggestions from code review
tomchristie Oct 7, 2024
e7c607c
Update docs/advanced/ssl.md
tomchristie Oct 7, 2024
f894a06
Apply suggestions from code review
tomchristie Oct 8, 2024
cb71af3
Update tests/test_config.py
tomchristie Oct 8, 2024
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
3 changes: 3 additions & 0 deletions httpx/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1455,6 +1455,9 @@ def _init_proxy_transport(
) -> AsyncBaseTransport:
return AsyncHTTPTransport(
ssl_context=ssl_context,
verify=verify,
cert=cert,
http1=http1,
tomchristie marked this conversation as resolved.
Show resolved Hide resolved
http2=http2,
limits=limits,
proxy=proxy,
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.