From 6f5612a7b0b423fed4a8d725f2a106ed4c2dc93b Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 25 Mar 2008 15:42:50 +0000 Subject: [PATCH] Merged revisions 110636 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r110636 | mmichelson | 2008-03-25 10:41:33 -0500 (Tue, 25 Mar 2008) | 15 lines Merged revisions 110635 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r110635 | mmichelson | 2008-03-25 10:40:33 -0500 (Tue, 25 Mar 2008) | 7 lines When reverting a commit, I accidentally left in this bit which was an experiment to see what would happen. It passed the compile test, and I didn't notice I had left this change in too. So this is a revert of a revert...sort of. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@110637 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 56efbd6071..2d7645f086 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17203,7 +17203,9 @@ static int handle_request_cancel(struct sip_pvt *p, struct sip_request *req) update_call_counter(p, DEC_CALL_LIMIT); stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */ - + if (p->owner) + ast_queue_hangup(p->owner); + else if (p->owner) ast_queue_hangup(p->owner); else