Skip to content

Commit

Permalink
Merge pull request esl#23 from egobrain/bugfix/default-connect-timeout
Browse files Browse the repository at this point in the history
Fix Issue esl#21
  • Loading branch information
Evgeny Bob authored Nov 7, 2018
2 parents 4ac71aa + 24295a1 commit 8e34985
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/lhttpc_client.erl
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ execute(From, Host, Port, Ssl, Path, Method, Hdrs0, Body, Options) ->
% get the socket connect settings from client or use defaults
% unfold all atoms and allow users to overwrite a single param only
DefOptions = proplists:unfold(application:get_env(lhttpc, connect_options, [])),
DefTimeout = proplists:get_value(connect_timeout, DefOptions, infinity),
DefTimeout = application:get_env(lhttpc, connect_timeout, infinity),
UserOptions = proplists:unfold(proplists:get_value(connect_options, Options, [])),
EffectiveTcpOptions0 = lists:ukeymerge(1,
lists:ukeysort(1, UserOptions),
Expand Down

0 comments on commit 8e34985

Please sign in to comment.