diff options
| author | Mickaël Rémond <mickael.remond@process-one.net> | 2006-05-29 16:48:20 +0000 |
|---|---|---|
| committer | Mickaël Rémond <mickael.remond@process-one.net> | 2006-05-29 16:48:20 +0000 |
| commit | ce5d10eb5919e95eb07276ee9cd3c2b3b5177bac (patch) | |
| tree | 81d42811fc2192fe98fdfb0309a78422ab498541 | |
| parent | * src/configure: removed debug printout. (diff) | |
* src/mod_roster.erl: According to RFC3921 section 9.2, outbound
subscribe presence packets must be sent, even if the user has already
asked for subcription previously (subscription: none and pending: out).
The mod_roster now conforms to this behaviour (EJAB-102).
* src/mod_roster_odbc.erl: Likewise.
SVN Revision: 574
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/mod_roster.erl | 2 | ||||
| -rw-r--r-- | src/mod_roster_odbc.erl | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2006-05-29 Mickael Remond <mickael.remond@process-one.net> + + * src/mod_roster.erl: According to RFC3921 section 9.2, outbound + subscribe presence packets must be sent, even if the user has already + asked for subcription previously (subscription: none and pending: out). + The mod_roster now conforms to this behaviour. + * src/mod_roster_odbc.erl: Likewise. + 2006-05-27 Mickael Remond <mickael.remond@process-one.net> * src/configure.ac: Added an optional check for krb5.h in diff --git a/src/mod_roster.erl b/src/mod_roster.erl index ce5cb4e87..896b0e9f9 100644 --- a/src/mod_roster.erl +++ b/src/mod_roster.erl @@ -507,7 +507,7 @@ out_state_change(none, none, subscribe) -> {none, out}; out_state_change(none, none, subscribed) -> none; out_state_change(none, none, unsubscribe) -> none; out_state_change(none, none, unsubscribed) -> none; -out_state_change(none, out, subscribe) -> none; +out_state_change(none, out, subscribe) -> {none, out}; %% We need to resend query (RFC3921, section 9.2) out_state_change(none, out, subscribed) -> none; out_state_change(none, out, unsubscribe) -> {none, none}; out_state_change(none, out, unsubscribed) -> none; diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl index a9f596c87..626698cc7 100644 --- a/src/mod_roster_odbc.erl +++ b/src/mod_roster_odbc.erl @@ -609,7 +609,7 @@ out_state_change(none, none, subscribe) -> {none, out}; out_state_change(none, none, subscribed) -> none; out_state_change(none, none, unsubscribe) -> none; out_state_change(none, none, unsubscribed) -> none; -out_state_change(none, out, subscribe) -> none; +out_state_change(none, out, subscribe) -> {none, out}; %% We need to resend query (RFC3921, section 9.2) out_state_change(none, out, subscribed) -> none; out_state_change(none, out, unsubscribe) -> {none, none}; out_state_change(none, out, unsubscribed) -> none; |