Merged revisions 58121 via svnmerge from
authorSteve Murphy <murf@digium.com>
Tue, 6 Mar 2007 23:19:59 +0000 (23:19 +0000)
committerSteve Murphy <murf@digium.com>
Tue, 6 Mar 2007 23:19:59 +0000 (23:19 +0000)
commit5bb1d16f47357afcd73900d07165e3c925016c1e
treed68a2bdbfa1042fda7aed217f4d4fc9e29ab0864
parentba432b7319a0a320a19dfc3d926f9af6e81e1ffb
Merged revisions 58121 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r58121 | murf | 2007-03-06 16:10:14 -0700 (Tue, 06 Mar 2007) | 9 lines

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

........
r58115 | murf | 2007-03-06 15:52:52 -0700 (Tue, 06 Mar 2007) | 1 line

Fix for 9220: Eyebeam cannot renew subscriptions for presence info. Reason: re-SUBSCRIBE requests don't include Accept headers, which the rfc says are optional (to put it tersely), (it uses MAY), and luckily, the sip_pvt struct has the format info stored, so we simply leave it if the format is set, and the accept header null.
........

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

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