[svn-commits] file: branch 1.6.0 r122871 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Jun 16 07:10:50 2008
New Revision: 122871

URL: http://svn.digium.com/view/asterisk?view=rev&rev=122871
Log:
Merged revisions 122870 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r122870 | file | 2008-06-16 09:09:54 -0300 (Mon, 16 Jun 2008) | 14 lines

Merged revisions 122869 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r122869 | file | 2008-06-16 09:08:28 -0300 (Mon, 16 Jun 2008) | 6 lines

Don't send a BYE on a dialog that is already gone during a REFER.
(closes issue #12865)
Reported by: flefoll
Patches:
      chan_sip.c.br14.121495.patch-ALREADYGONE uploaded by flefoll (license 244)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=122871&r1=122870&r2=122871
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Mon Jun 16 07:10:50 2008
@@ -2893,7 +2893,7 @@
 		ast_log(LOG_WARNING, "Autodestruct on dialog '%s' with owner in place (Method: %s)\n", p->callid, sip_methods[p->method].text);
 		ast_queue_hangup(p->owner);
 		dialog_unref(p);
-	} else if (p->refer) {
+	} else if (p->refer && !p->alreadygone) {
 		ast_debug(3, "Finally hanging up channel after transfer: %s\n", p->callid);
 		transmit_request_with_auth(p, SIP_BYE, 0, XMIT_RELIABLE, 1);
 		append_history(p, "ReferBYE", "Sending BYE on transferer call leg %s", p->callid);