[svn-commits] mmichelson: branch 1.6.1 r150208 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Oct 16 15:58:26 2008
New Revision: 150208

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150208
Log:
Merged revisions 150207 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r150207 | mmichelson | 2008-10-16 15:57:18 -0500 (Thu, 16 Oct 2008) | 12 lines

INVITES with proxy auth were sent with a different branch
than what was in the invite_branch of a sip_pvt, meaning
that if a CANCEL were sent later, the branch in the CANCEL
would not match the branch in the latest INVITE sent out, leading
to some endpoints responding to the CANCEL with a 481.

(closes issue #13714)
Reported by: fnordian
Patches:
      invite_branch.patch uploaded by fnordian (license 110)


........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=150208&r1=150207&r2=150208
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Thu Oct 16 15:58:26 2008
@@ -7816,7 +7816,7 @@
 		seqno = p->ocseq;
 	}
 	
-	if (sipmethod == SIP_CANCEL) {
+	if (sipmethod == SIP_CANCEL || sipmethod == SIP_INVITE) {
 		p->branch = p->invite_branch;
 		build_via(p);
 	} else if (newbranch) {