diff options
| author | Pablo Polvorin <ppolvorin@process-one.net> | 2016-07-19 20:19:17 -0300 |
|---|---|---|
| committer | Pablo Polvorin <ppolvorin@process-one.net> | 2016-07-19 20:19:17 -0300 |
| commit | b5a90be3cbdf4810d63d38e6e37a16cf79f442bf (patch) | |
| tree | c8f70e14f9756d79b62d652742a1b5dadb192c55 | |
| parent | Let user choose the desired oauth token TTL (diff) | |
| parent | mod_mam: Fix handling of result set page limit (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
| -rw-r--r-- | src/mod_mam.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mod_mam.erl b/src/mod_mam.erl index 10eb098da..7e1460695 100644 --- a/src/mod_mam.erl +++ b/src/mod_mam.erl @@ -1032,6 +1032,8 @@ filter_by_max(_Msgs, _Junk) -> limit_max(RSM, ?NS_MAM_TMP) -> RSM; % XEP-0313 v0.2 doesn't require clients to support RSM. +limit_max(none, _NS) -> + #rsm_in{max = ?DEF_PAGE_SIZE}; limit_max(#rsm_in{max = Max} = RSM, _NS) when not is_integer(Max) -> RSM#rsm_in{max = ?DEF_PAGE_SIZE}; limit_max(#rsm_in{max = Max} = RSM, _NS) when Max > ?MAX_PAGE_SIZE -> |