From: Mark Michelson Date: Tue, 25 Mar 2008 15:41:33 +0000 (+0000) Subject: Merged revisions 110635 via svnmerge from X-Git-Tag: 1.6.0-beta7~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67efba6e50619a487656700b6bd481289b54c6bb;p=thirdparty%2Fasterisk.git 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/trunk@110636 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1281752341..ba8fbd9b23 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17288,7 +17288,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