diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-09-12 17:36:19 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-10-02 09:25:02 +0200 |
| commit | 9c85ee8b61c24587a228b3644c37b1b4fdfb7dcb (patch) | |
| tree | 46a3a6296444482609d628538e2280a14f8db958 /lib/inets/src/http_client/httpc_manager.erl | |
| parent | 9880ff4e299269055ddbdf2e0332737099a2bcfd (diff) | |
| download | otp-9c85ee8b61c24587a228b3644c37b1b4fdfb7dcb.tar.gz otp-9c85ee8b61c24587a228b3644c37b1b4fdfb7dcb.tar.bz2 otp-9c85ee8b61c24587a228b3644c37b1b4fdfb7dcb.zip | |
inets httpc: TLS via proxy
Introduces new option htts_proxy so that it is possible
to have different proxies for http and https. The new option
defaults to the old proxy option.
Implements HTTP-1.1 extension method CONNECT to establish SSL/TLS tunnel
We choose not to implement "TLS upgrade" as defined by RFC 2817 as
this method of upgrade is vulnerable to man in the middle attacks,
can be easily broken by proxies and does not seem to be widely adopted.
Diffstat (limited to 'lib/inets/src/http_client/httpc_manager.erl')
| -rw-r--r-- | lib/inets/src/http_client/httpc_manager.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/inets/src/http_client/httpc_manager.erl b/lib/inets/src/http_client/httpc_manager.erl index 3612b331e7..a267be5d05 100644 --- a/lib/inets/src/http_client/httpc_manager.erl +++ b/lib/inets/src/http_client/httpc_manager.erl @@ -577,6 +577,7 @@ handle_cast({set_options, Options}, State = #state{options = OldOptions}) -> ?hcrv("set options", [{options, Options}, {old_options, OldOptions}]), NewOptions = #options{proxy = get_proxy(Options, OldOptions), + https_proxy = get_https_proxy(Options, OldOptions), pipeline_timeout = get_pipeline_timeout(Options, OldOptions), max_pipeline_length = get_max_pipeline_length(Options, OldOptions), max_keep_alive_length = get_max_keep_alive_length(Options, OldOptions), @@ -1027,6 +1028,9 @@ get_option(socket_opts, #options{socket_opts = SocketOpts}) -> get_proxy(Opts, #options{proxy = Default}) -> proplists:get_value(proxy, Opts, Default). +get_https_proxy(Opts, #options{https_proxy = Default}) -> + proplists:get_value(https_proxy, Opts, Default). + get_pipeline_timeout(Opts, #options{pipeline_timeout = Default}) -> proplists:get_value(pipeline_timeout, Opts, Default). |