diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-16 20:58:26 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-16 20:58:26 +0000 |
| commit | c3dc265b337814280db7a436a680fee0c2fc7cb0 (patch) | |
| tree | 55b72af02053b1578282b7c763b87639a928f338 /channels | |
| parent | 7b019c05e4e2b3cd418a3ef44466fc7f4f9237c6 (diff) | |
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)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@150208 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fcc9a4337..57ed9b6f5 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -7816,7 +7816,7 @@ static int reqprep(struct sip_request *req, struct sip_pvt *p, int sipmethod, in 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) { |