This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "emacs-jabber".
The branch, master has been updated
via 993b1d7fbeddc03d0d0e187fe7c8b7354cc6b330 (commit)
from 350ef23aaac0242e470fd8fac3a447b7df77f293 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 993b1d7fbeddc03d0d0e187fe7c8b7354cc6b330
Author: Magnus Henoch <mag...@gm...>
Date: Fri Sep 6 10:46:51 2013 +0100
Accept roster push from server JID
That is what Facebook does.
diff --git a/jabber-presence.el b/jabber-presence.el
index 461b6df..7fa9b19 100644
--- a/jabber-presence.el
+++ b/jabber-presence.el
@@ -49,13 +49,15 @@ CLOSURE-DATA should be 'initial if initial roster push, nil otherwise."
(resource (plist-get (fsm-get-state-data jc) :resource))
new-items changed-items deleted-items)
;; Perform sanity check on "from" attribute: it should be either absent
- ;; or match our own JID.
+ ;; match our own JID, or match the server's JID (the latter is what
+ ;; Facebook does).
(if (not (or (null from)
+ (string= from server)
(string= from (concat username "@" server))
(string= from (concat username "@" server "/" resource))))
- (message "Roster push with invalid \"from\": \"%s\" (expected \"%s@%s\" or \"%s@%s/%s\")"
+ (message "Roster push with invalid \"from\": \"%s\" (expected \"%s\", \"%s@%s\" or \"%s@%s/%s\")"
from
- username server username server resource)
+ server username server username server resource)
(dolist (item (jabber-xml-get-children (car (jabber-xml-get-children xml-data 'query)) 'item))
(let (roster-item
-----------------------------------------------------------------------
Summary of changes:
jabber-presence.el | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
emacs-jabber
|
