Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## Development

* Add `socket_options` to `Client` and `AsyncClient` classes. (#3587)

## 0.28.1 (6th December, 2024)

* Fix SSL case where `verify=False` together with client side certificates.
Expand Down
16 changes: 15 additions & 1 deletion httpx/_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from ._models import Cookies, Headers, Request, Response
from ._status_codes import codes
from ._transports.base import AsyncBaseTransport, BaseTransport
from ._transports.default import AsyncHTTPTransport, HTTPTransport
from ._transports.default import SOCKET_OPTION, AsyncHTTPTransport, HTTPTransport
from ._types import (
AsyncByteStream,
AuthTypes,
Expand Down Expand Up @@ -653,6 +653,7 @@ def __init__(
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
follow_redirects: bool = False,
limits: Limits = DEFAULT_LIMITS,
socket_options: typing.Iterable[SOCKET_OPTION] | None = None,
max_redirects: int = DEFAULT_MAX_REDIRECTS,
event_hooks: None | (typing.Mapping[str, list[EventHook]]) = None,
base_url: URL | str = "",
Expand Down Expand Up @@ -693,6 +694,7 @@ def __init__(
http2=http2,
limits=limits,
transport=transport,
socket_options=socket_options,
)
self._mounts: dict[URLPattern, BaseTransport | None] = {
URLPattern(key): None
Expand All @@ -705,6 +707,7 @@ def __init__(
http1=http1,
http2=http2,
limits=limits,
socket_options=socket_options,
)
for key, proxy in proxy_map.items()
}
Expand All @@ -723,6 +726,7 @@ def _init_transport(
http1: bool = True,
http2: bool = False,
limits: Limits = DEFAULT_LIMITS,
socket_options: typing.Iterable[SOCKET_OPTION] | None = None,
transport: BaseTransport | None = None,
) -> BaseTransport:
if transport is not None:
Expand All @@ -735,6 +739,7 @@ def _init_transport(
http1=http1,
http2=http2,
limits=limits,
socket_options=socket_options,
)

def _init_proxy_transport(
Expand All @@ -746,6 +751,7 @@ def _init_proxy_transport(
http1: bool = True,
http2: bool = False,
limits: Limits = DEFAULT_LIMITS,
socket_options: typing.Iterable[SOCKET_OPTION] | None = None,
) -> BaseTransport:
return HTTPTransport(
verify=verify,
Expand All @@ -755,6 +761,7 @@ def _init_proxy_transport(
http2=http2,
limits=limits,
proxy=proxy,
socket_options=socket_options,
)

def _transport_for_url(self, url: URL) -> BaseTransport:
Expand Down Expand Up @@ -1366,6 +1373,7 @@ def __init__(
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
follow_redirects: bool = False,
limits: Limits = DEFAULT_LIMITS,
socket_options: typing.Iterable[SOCKET_OPTION] | None = None,
max_redirects: int = DEFAULT_MAX_REDIRECTS,
event_hooks: None | (typing.Mapping[str, list[EventHook]]) = None,
base_url: URL | str = "",
Expand Down Expand Up @@ -1407,6 +1415,7 @@ def __init__(
http2=http2,
limits=limits,
transport=transport,
socket_options=socket_options,
)

self._mounts: dict[URLPattern, AsyncBaseTransport | None] = {
Expand All @@ -1420,6 +1429,7 @@ def __init__(
http1=http1,
http2=http2,
limits=limits,
socket_options=socket_options,
)
for key, proxy in proxy_map.items()
}
Expand All @@ -1437,6 +1447,7 @@ def _init_transport(
http1: bool = True,
http2: bool = False,
limits: Limits = DEFAULT_LIMITS,
socket_options: typing.Iterable[SOCKET_OPTION] | None = None,
transport: AsyncBaseTransport | None = None,
) -> AsyncBaseTransport:
if transport is not None:
Expand All @@ -1449,6 +1460,7 @@ def _init_transport(
http1=http1,
http2=http2,
limits=limits,
socket_options=socket_options,
)

def _init_proxy_transport(
Expand All @@ -1460,6 +1472,7 @@ def _init_proxy_transport(
http1: bool = True,
http2: bool = False,
limits: Limits = DEFAULT_LIMITS,
socket_options: typing.Iterable[SOCKET_OPTION] | None = None,
) -> AsyncBaseTransport:
return AsyncHTTPTransport(
verify=verify,
Expand All @@ -1469,6 +1482,7 @@ def _init_proxy_transport(
http2=http2,
limits=limits,
proxy=proxy,
socket_options=socket_options,
)

def _transport_for_url(self, url: URL) -> AsyncBaseTransport:
Expand Down