kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-22 14:34:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 44393 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44393 | kpfleming | 2006-10-04 16:17:30 -0500 (Wed, 04 Oct 2006) | 11 lines

Merged revisions 44392 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44392 | kpfleming | 2006-10-04 16:15:29 -0500 (Wed, 04 Oct 2006) | 3 lines

remove workaround for old Polycom firmware SUBSCRIBE requests
add workaround for new Polycom firmware SUBSCRIBE requests (bug is known to exist in 2.0.1 firmware)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44394 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-10-04 21:20:55 +00:00
parent c28461197b
commit 50bcacbdbd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+4 -4
View File
@@ -13881,7 +13881,6 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
return 0;
} else {
/* XXX reduce nesting here */
/* Initialize tag for new subscriptions */
if (ast_strlen_zero(p->tag))
make_our_tag(p->tag, sizeof(p->tag));
@@ -13889,7 +13888,10 @@ 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 */
if (strstr(accept, "application/pidf+xml")) {
/* don't supply pidf+xml to Polycom phones until they fix their firmware to
parse it properly
*/
if (strstr(accept, "application/pidf+xml") && !strstr(p->useragent, "Polycom")) {
p->subscribed = PIDF_XML; /* RFC 3863 format */
} else if (strstr(accept, "application/dialog-info+xml")) {
p->subscribed = DIALOG_INFO_XML;
@@ -13898,8 +13900,6 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
p->subscribed = CPIM_PIDF_XML; /* RFC 3863 format */
} else if (strstr(accept, "application/xpidf+xml")) {
p->subscribed = XPIDF_XML; /* Early pre-RFC 3863 format with MSN additions (Microsoft Messenger) */
} else if (strstr(p->useragent, "Polycom")) {
p->subscribed = XPIDF_XML; /* Polycoms subscribe for "event: dialog" but don't include an "accept:" header */
} else {
/* Can't find a format for events that we know about */
transmit_response(p, "489 Bad Event", req);