fix Polycom presence notification again

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@44432 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9c744edc7050bc2567a9e111396c1cdae5d31aba..dc6f83131bed53c7897b577b07a31b6edd2e85a5 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10952,10 +10952,12 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
                        if (!strcmp(event, "presence") || !strcmp(event, "dialog")) { /* Presence, RFC 3842 */
 
                                /* Header from Xten Eye-beam Accept: multipart/related, application/rlmi+xml, application/pidf+xml, application/xpidf+xml */
-                               /* don't supply pidf+xml to Polycom phones until they fix their firmware to
-                                  parse it properly
+                               /* Polycom phones only handle xpidf+xml, even if they say they can
+                                  handle pidf+xml as well
                                */
-                               if (strstr(accept, "application/pidf+xml") && !strstr(p->useragent, "Polycom")) {
+                               if (strstr(p->useragent, "Polycom")) {
+                                       p->subscribed = XPIDF_XML;
+                               } else if (strstr(accept, "application/pidf+xml")) {
                                        p->subscribed = PIDF_XML;         /* RFC 3863 format */
                                } else if (strstr(accept, "application/dialog-info+xml")) {
                                        p->subscribed = DIALOG_INFO_XML;