diff options
author | Péter Dimitrov <[email protected]> | 2018-03-06 10:47:09 +0100 |
---|---|---|
committer | Péter Dimitrov <[email protected]> | 2018-03-06 10:47:09 +0100 |
commit | b8b3abfacb40d147ec834cc18742b356d6b03236 (patch) | |
tree | 446a418d65b26f0b28ef0bab772b392493a7f57f /lib/inets/src/http_client/httpc_internal.hrl | |
parent | 84a2ed39f035dd1a569dca370dc11876993c6ecf (diff) | |
parent | a9c87dbf7e5cb0ac50424bde9cd53772e7b77292 (diff) | |
download | otp-b8b3abfacb40d147ec834cc18742b356d6b03236.tar.gz otp-b8b3abfacb40d147ec834cc18742b356d6b03236.tar.bz2 otp-b8b3abfacb40d147ec834cc18742b356d6b03236.zip |
Merge branch 'peterdmv/inets/unix_domain_socket/OTP-14854' into maint
* peterdmv/inets/unix_domain_socket/OTP-14854:
inets: Prepare for release
inets: Skip http_unix_socket test group on Windows
inets: Add unix domain socket support to httpc
Change-Id: I680e41463849a9d79add1385ec2703267be8754c
Diffstat (limited to 'lib/inets/src/http_client/httpc_internal.hrl')
-rw-r--r-- | lib/inets/src/http_client/httpc_internal.hrl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/inets/src/http_client/httpc_internal.hrl b/lib/inets/src/http_client/httpc_internal.hrl index 5f8c70f28d..c5fe439722 100644 --- a/lib/inets/src/http_client/httpc_internal.hrl +++ b/lib/inets/src/http_client/httpc_internal.hrl @@ -83,10 +83,11 @@ max_sessions = ?HTTP_MAX_TCP_SESSIONS, cookies = disabled, % enabled | disabled | verify verbose = false, % boolean(), - ipfamily = inet, % inet | inet6 | inet6fb4 + ipfamily = inet, % inet | inet6 | inet6fb4 | local ip = default, % specify local interface port = default, % specify local port - socket_opts = [] % other socket options + socket_opts = [], % other socket options + unix_socket = undefined % Local unix socket } ). -type options() :: #options{}. @@ -115,6 +116,7 @@ % request timer :: undefined | reference(), socket_opts, % undefined | [socket_option()] + unix_socket, % undefined | string() ipv6_host_with_brackets % boolean() } ). |