diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2009-02-23 15:56:19 +0000 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2009-02-23 15:56:19 +0000 |
| commit | 04fde3620decbc56984b3b91ff990863a87ca2cd (patch) | |
| tree | 0c0469f8b3ac89ca6ffbb897a47bb094a575d971 | |
| parent | * src/web/ejabberd_http.erl: Added a workaround for inet:peername (diff) | |
Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)
SVN Revision: 1912
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/ejabberd_c2s.erl | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -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-23 Alexey Shchepin <alexey@process-one.net> * src/web/ejabberd_http.erl: Added a workaround for inet:peername diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 6d68d249b..4b55e0250 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -1125,7 +1125,9 @@ handle_info({route, From, To, Packet}, StateName, StateData) -> %% Note contact availability case xml:get_attr_s("type", Attrs) of "unavailable" -> - mod_caps:clear_caps(From); + %mod_caps:clear_caps(From); + % caps clear disabled cause it breaks things + ok; _ -> Caps = mod_caps:read_caps(Els), mod_caps:note_caps(StateData#state.server, From, Caps) |