summaryrefslogtreecommitdiff
path: root/src/web/ejabberd_http_bind.erl
diff options
context:
space:
mode:
authorAndreas Köhler <andreas.koehler@1und1.de>2010-11-09 14:11:38 +0100
committerBadlop <badlop@process-one.net>2010-11-17 13:01:17 +0100
commitcfd377b98e9d144cf2cd10b68aecbd824773bac6 (patch)
tree5c0a89e5b35fe442bf7c59e703d541eec3c84e11 /src/web/ejabberd_http_bind.erl
parentUse LFrom and LTo consistently in ejabberd_s2s_in:stream_established/2 (EJAB-... (diff)
Fix R12B5 compatibility in ejabberd_http_bind.erl (EJAB-1343)
erlang:max/2 and :min/2 are new functions
Diffstat (limited to '')
-rw-r--r--src/web/ejabberd_http_bind.erl4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/web/ejabberd_http_bind.erl b/src/web/ejabberd_http_bind.erl
index 27ea3c08..a51c5535 100644
--- a/src/web/ejabberd_http_bind.erl
+++ b/src/web/ejabberd_http_bind.erl
@@ -270,9 +270,7 @@ handle_session_start(Pid, XmppDomain, Sid, Rid, Attrs,
(CPdelay =< ?PROCESS_DELAY_MAX) ->
CPdelay;
{CPdelay, _} ->
- erlang:max(
- erlang:min(CPdelay,?PROCESS_DELAY_MAX),
- ?PROCESS_DELAY_MIN)
+ lists:max([lists:min([CPdelay, ?PROCESS_DELAY_MAX]), ?PROCESS_DELAY_MIN])
end,
Version =
case catch list_to_float(