From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 22 Jun 2009 16:14:10 +0000 (+0000)
Subject: Merged revisions 202415 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bce657f8447da5d075311bf4d0c18549ddd290d;p=thirdparty%2Fasterisk.git

Merged revisions 202415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202415 | russell | 2009-06-22 11:05:08 -0500 (Mon, 22 Jun 2009) | 9 lines

  Merged revisions 202414 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r202414 | russell | 2009-06-22 11:00:00 -0500 (Mon, 22 Jun 2009) | 2 lines

    Make Polycom subscription type override check more explicit.
  ........
................


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8af0412f95..f3d436c43a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19640,16 +19640,20 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
 		make_our_tag(p->tag, sizeof(p->tag));
 
 	if (!strcmp(event, "presence") || !strcmp(event, "dialog")) { /* Presence, RFC 3842 */
+		unsigned int pidf_xml;
+
 		if (authpeer)	/* We do not need the authpeer any more */
 			unref_peer(authpeer, "unref_peer, from handle_request_subscribe (authpeer 2)");
 
 		/* Header from Xten Eye-beam Accept: multipart/related, application/rlmi+xml, application/pidf+xml, application/xpidf+xml */
-		/* Polycom phones only handle xpidf+xml, even if they say they can
-		   handle pidf+xml as well
-		*/
-		if (strstr(p->useragent, "Polycom")) {
+
+		pidf_xml = strstr(acceptheader, "application/pidf+xml") ? 1 : 0;
+
+		/* Older versions of Polycom firmware will claim pidf+xml, but really
+		 * they only support xpidf+xml. */
+		if (pidf_xml && strstr(p->useragent, "Polycom")) {
 			p->subscribed = XPIDF_XML;
-		} else if (strstr(acceptheader, "application/pidf+xml")) {
+		} else if (pidf_xml) {
 			p->subscribed = PIDF_XML;         /* RFC 3863 format */
 		} else if (strstr(acceptheader, "application/dialog-info+xml")) {
 			p->subscribed = DIALOG_INFO_XML;