aboutsummaryrefslogtreecommitdiff
path: root/src/ejabberd_http.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/ejabberd_http.erl')
-rw-r--r--src/ejabberd_http.erl7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
index 5c591386d..7072c49fd 100644
--- a/src/ejabberd_http.erl
+++ b/src/ejabberd_http.erl
@@ -521,12 +521,7 @@ analyze_ip_xff(IP, [], _Host) -> IP;
analyze_ip_xff({IPLast, Port}, XFF, Host) ->
[ClientIP | ProxiesIPs] = str:tokens(XFF, <<", ">>) ++
[misc:ip_to_list(IPLast)],
- TrustedProxies = ejabberd_config:get_option(
- {trusted_proxies, Host},
- fun(all) -> all;
- (TPs) ->
- [iolist_to_binary(TP) || TP <- TPs]
- end, []),
+ TrustedProxies = ejabberd_config:get_option({trusted_proxies, Host}, []),
IPClient = case is_ipchain_trusted(ProxiesIPs,
TrustedProxies)
of