Fixed invocation of socks proxy
Project: http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/commit/b5c705cb Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/tree/b5c705cb Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/diff/b5c705cb Branch: refs/heads/upstream Commit: b5c705cb8fc369cc51012eac9fd49e5f7b6a87e9 Parents: 1917a70 Author: Chandrashekhar Mullaparthi <[email protected]> Authored: Sun Jan 31 16:57:33 2016 +0000 Committer: Chandrashekhar Mullaparthi <[email protected]> Committed: Sun Jan 31 16:57:33 2016 +0000 ---------------------------------------------------------------------- src/ibrowse_http_client.erl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/blob/b5c705cb/src/ibrowse_http_client.erl ---------------------------------------------------------------------- diff --git a/src/ibrowse_http_client.erl b/src/ibrowse_http_client.erl index 2d700a7..c668141 100644 --- a/src/ibrowse_http_client.erl +++ b/src/ibrowse_http_client.erl @@ -568,11 +568,12 @@ do_connect(Host, Port, Options, #state{is_ssl = true, ssl:connect(Host, Port, get_sock_options(Host, Options, SSLOptions), Timeout); do_connect(Host, Port, Options, _State, Timeout) -> Socks5Host = get_value(socks5_host, Options, undefined), + Sock_options = get_sock_options(Host, Options, []), case Socks5Host of undefined -> - gen_tcp:connect(Host, Port, get_sock_options(Host, Options, []), Timeout); + gen_tcp:connect(Host, Port, Sock_options, Timeout); _ -> - catch ibrowse_socks5:connect(Host, Port, Options) + catch ibrowse_socks5:connect(Host, Port, Options, Sock_options, Timeout) end. get_sock_options(Host, Options, SSLOptions) ->
