[svn-commits] kpfleming: branch 1.2 r44432 - /branches/1.2/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Wed Oct  4 20:27:57 2006
New Revision: 44432

URL: http://svn.digium.com/view/asterisk?rev=44432&view=rev
Log:
fix Polycom presence notification again

Modified:
    branches/1.2/channels/chan_sip.c

Modified: branches/1.2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_sip.c?rev=44432&r1=44431&r2=44432&view=diff
==============================================================================
--- branches/1.2/channels/chan_sip.c (original)
+++ branches/1.2/channels/chan_sip.c Wed Oct  4 20:27:57 2006
@@ -10952,10 +10952,12 @@
 			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;