diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-05 02:02:12 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-05 02:02:12 +0000 |
| commit | d967982125b950683b511680c6e34b7258540092 (patch) | |
| tree | 3350763589077c8bba26549456fc1d8e8ebd8c08 /channels | |
| parent | a0bf1620d9b122fa6423779c164e5efff8b8ff23 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@44449 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8f7e1a50a..6b9d96d0f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -11062,10 +11062,12 @@ 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 */ - /* 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; |