From: Kinsey Moore <kmoore@digium.com>
Date: Thu, 2 Aug 2012 15:51:17 +0000 (+0000)
Subject: Fix regression from r370636
X-Git-Tag: 11.0.0-beta1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e108a5777aa65da240a90d4dc153616a46e2b923;p=thirdparty%2Fasterisk.git

Fix regression from r370636

When the chan_sip cleanup went in, a typo was included that caused some
subscriptions of non-Polycom phones to be limited to the same
capabilities as Polycom phones. This resolves the failures in the test
suite resulting from this regression.


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c56c553dd0..ac1a0e0165 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -26604,7 +26604,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
 				if (strstr(p->useragent, "Polycom")) {
 					subscribed = XPIDF_XML; /* Older versions of Polycom firmware will claim pidf+xml, but really they only support xpidf+xml */
 				} else {
-					subscribed = XPIDF_XML; /* RFC 3863 format */
+					subscribed = PIDF_XML; /* RFC 3863 format */
 				}
 			} else if (strstr(accept, "application/dialog-info+xml")) {
 				subscribed = DIALOG_INFO_XML;