Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Merge remote branch 'mainline/2.1.x' into 2.2.x

Browse Source
This commit is contained in:
Christophe Romain 2011-02-15 10:48:27 +01:00
commit 8e68e89816
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod_pubsub/mod_pubsub.erl
View File

@ -2021,7 +2021,7 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload) ->
DeliverPayloads = get_option(Options, deliver_payloads), DeliverPayloads = get_option(Options, deliver_payloads),
PersistItems = get_option(Options, persist_items), PersistItems = get_option(Options, persist_items),
PayloadCount = payload_xmlelements(Payload), PayloadCount = payload_xmlelements(Payload),
PayloadSize = size(term_to_binary(Payload)), PayloadSize = size(term_to_binary(Payload))-2, % size(term_to_binary([])) == 2
PayloadMaxSize = get_option(Options, max_payload_size), PayloadMaxSize = get_option(Options, max_payload_size),
% pubsub#deliver_payloads true % pubsub#deliver_payloads true
% pubsub#persist_items true -> 1 item; false -> 0 item % pubsub#persist_items true -> 1 item; false -> 0 item

2
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -1837,7 +1837,7 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload) ->
DeliverPayloads = get_option(Options, deliver_payloads), DeliverPayloads = get_option(Options, deliver_payloads),
PersistItems = get_option(Options, persist_items), PersistItems = get_option(Options, persist_items),
PayloadCount = payload_xmlelements(Payload), PayloadCount = payload_xmlelements(Payload),
PayloadSize = size(term_to_binary(Payload)), PayloadSize = size(term_to_binary(Payload))-2, % size(term_to_binary([])) == 2
PayloadMaxSize = get_option(Options, max_payload_size), PayloadMaxSize = get_option(Options, max_payload_size),
% pubsub#deliver_payloads true % pubsub#deliver_payloads true
% pubsub#persist_items true -> 1 item; false -> 0 item % pubsub#persist_items true -> 1 item; false -> 0 item