Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)

Browse Source 
SVN Revision: 1913
This commit is contained in:
Christophe Romain 2009-02-23 15:58:21 +00:00
parent 4956259124
commit 7a17baccac
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-02-23 Christophe Romain <christophe.romain@process-one.net>
* src/ejabberd_c2s.erl: Do not call mod_caps:clear_caps, this previous
optimization is too agressive and breaks PubSub/PEP standard behavior
(EJAB-854)
2009-02-21 Pablo Polvorin <pablo.polvorin@process-one.net> 2009-02-21 Pablo Polvorin <pablo.polvorin@process-one.net>
* src/mod_roster.erl: Bugfix in remove_user/2: values already * src/mod_roster.erl: Bugfix in remove_user/2: values already

10
src/ejabberd_c2s.erl
View File

@ -1062,11 +1062,13 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
Els = Packet#xmlel.children, Els = Packet#xmlel.children,
case exmpp_presence:get_type(Packet) of case exmpp_presence:get_type(Packet) of
'unavailable' -> 'unavailable' ->
mod_caps:clear_caps(From); %mod_caps:clear_caps(From);
% caps clear disabled cause it breaks things
ok;
_ -> _ ->
ServerString = binary_to_list(StateData#state.server), ServerString = binary_to_list(StateData#state.server),
Caps = mod_caps:read_caps(Els), Caps = mod_caps:read_caps(Els),
mod_caps:note_caps(ServerString, From, Caps) mod_caps:note_caps(ServerString, From, Caps)
end, end,
case ?SETS:is_element( case ?SETS:is_element(
LFrom, StateData#state.pres_a) orelse LFrom, StateData#state.pres_a) orelse