diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-04 22:02:08 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-04 22:02:08 +0000 |
| commit | a0bf1620d9b122fa6423779c164e5efff8b8ff23 (patch) | |
| tree | e3e6c977a65a7559c1377d8a417fa5c3b0d3cdaa | |
| parent | 13efb5976e4ebae357a595f5e986a76b2766bc1c (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44406 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3bf9f8a64..8f7e1a50a 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11062,7 +11062,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; @@ -11071,8 +11074,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); |