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_manager.erl | |
| 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_manager.erl')
| -rw-r--r-- | lib/inets/src/http_client/httpc_manager.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl index ffdf1603b3..7b8d7875de 100644 --- a/lib/inets/src/http_client/httpc_manager.erl +++ b/lib/inets/src/http_client/httpc_manager.erl @@ -553,7 +553,8 @@ handle_cast({set_options, Options}, State = #state{options = OldOptions}) -> ip = get_ip(Options, OldOptions), port = get_port(Options, OldOptions), verbose = get_verbose(Options, OldOptions), - socket_opts = get_socket_opts(Options, OldOptions) + socket_opts = get_socket_opts(Options, OldOptions), + unix_socket = get_unix_socket_opts(Options, OldOptions) }, case {OldOptions#options.verbose, NewOptions#options.verbose} of {Same, Same} -> @@ -963,7 +964,10 @@ get_option(ip, #options{ip = IP}) -> get_option(port, #options{port = Port}) -> Port; get_option(socket_opts, #options{socket_opts = SocketOpts}) -> - SocketOpts. + SocketOpts; +get_option(unix_socket, #options{unix_socket = UnixSocket}) -> + UnixSocket. + get_proxy(Opts, #options{proxy = Default}) -> proplists:get_value(proxy, Opts, Default). @@ -1016,6 +1020,8 @@ get_verbose(Opts, #options{verbose = Default}) -> get_socket_opts(Opts, #options{socket_opts = Default}) -> proplists:get_value(socket_opts, Opts, Default). +get_unix_socket_opts(Opts, #options{unix_socket = Default}) -> + proplists:get_value(unix_socket, Opts, Default). handle_verbose(debug) -> dbg:p(self(), [call]), |