From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 25 Mar 2008 15:40:33 +0000 (+0000)
Subject: When reverting a commit, I accidentally left in this bit which was an experiment
X-Git-Tag: 1.4.19-rc4~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=baa405e8c3bd5416f99fe0d721a002da23067778;p=thirdparty%2Fasterisk.git

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.4@110635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 37056cec18..46a6cbb2fe 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -14655,7 +14655,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
 		sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
 	if (p->initreq.len > 0) {
 		transmit_response_reliable(p, "487 Request Terminated", &p->initreq);