diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-06 20:21:51 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-09-06 20:21:51 +0000 |
| commit | 9bc0aa9823081f0d5c3f44ecaba249c1b10915a6 (patch) | |
| tree | 376a5fe81eccf3a1f62b4ac84fd33a6c611ef5fd /channels | |
| parent | 460788269d6c1cc6281e45a4cb29327d0de5228a (diff) | |
Merged revisions 141566 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r141566 | murf | 2008-09-06 14:19:50 -0600 (Sat, 06 Sep 2008) | 9 lines
Merged revisions 141565 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r141565 | murf | 2008-09-06 14:13:16 -0600 (Sat, 06 Sep 2008) | 1 line
This fix comes from Joshua Colp The Brilliant, who, given the trace, came up with a solution. This will most likely will close 13235 and 13409. I'll wait till Monday to verify, and then close these bugs.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141567 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d10bc5a00..fb30e2baf 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17791,6 +17791,8 @@ static int handle_request_bye(struct sip_pvt *p, struct sip_request *req) if (p->pendinginvite && !ast_test_flag(&p->flags[0], SIP_OUTGOING) && !req->ignore && !p->owner) transmit_response_reliable(p, "487 Request Terminated", &p->initreq); + __sip_pretend_ack(p); + p->invitestate = INV_TERMINATED; copy_request(&p->initreq, req); |