diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-07-09 13:01:37 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-07-10 13:59:33 +0300 |
| commit | 8e27decdfd9f91bc9ae2c01bc4df2ca7254d8242 (patch) | |
| tree | 758b19fd3eec089d3eeb10fa8b8e882ccf987b02 /tools | |
| parent | Fix tests related to MAM (diff) | |
Fix mod_mam compatibility with RSM for other backends
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/xmpp_codec.erl | 4 | ||||
| -rw-r--r-- | tools/xmpp_codec.hrl | 2 | ||||
| -rw-r--r-- | tools/xmpp_codec.spec | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tools/xmpp_codec.erl b/tools/xmpp_codec.erl index 0dbc6280..08a2e84c 100644 --- a/tools/xmpp_codec.erl +++ b/tools/xmpp_codec.erl @@ -4746,10 +4746,10 @@ encode_rsm_before(Cdata, _xmlns_attrs) -> _attrs = _xmlns_attrs, {xmlel, <<"before">>, _attrs, _els}. -decode_rsm_before_cdata(__TopXMLNS, <<>>) -> undefined; +decode_rsm_before_cdata(__TopXMLNS, <<>>) -> none; decode_rsm_before_cdata(__TopXMLNS, _val) -> _val. -encode_rsm_before_cdata(undefined, _acc) -> _acc; +encode_rsm_before_cdata(none, _acc) -> _acc; encode_rsm_before_cdata(_val, _acc) -> [{xmlcdata, _val} | _acc]. diff --git a/tools/xmpp_codec.hrl b/tools/xmpp_codec.hrl index 567946fe..fa8e5e74 100644 --- a/tools/xmpp_codec.hrl +++ b/tools/xmpp_codec.hrl @@ -280,7 +280,7 @@ units = [] :: [binary()]}). -record(rsm_set, {'after' :: binary(), - before :: binary(), + before :: 'none' | binary(), count :: non_neg_integer(), first :: #rsm_first{}, index :: non_neg_integer(), diff --git a/tools/xmpp_codec.spec b/tools/xmpp_codec.spec index dfa516ef..326d1de3 100644 --- a/tools/xmpp_codec.spec +++ b/tools/xmpp_codec.spec @@ -2071,6 +2071,7 @@ -xml(rsm_before, #elem{name = <<"before">>, xmlns = <<"http://jabber.org/protocol/rsm">>, + cdata = #cdata{default = none}, result = '$cdata'}). -xml(rsm_last, |