[svn-commits] murf: branch 1.6.0 r141567 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: murf
Date: Sat Sep  6 15:21:51 2008
New Revision: 141567

URL: http://svn.digium.com/view/asterisk?view=rev&rev=141567
Log:
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.
........

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

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=141567&r1=141566&r2=141567
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Sat Sep  6 15:21:51 2008
@@ -17790,6 +17790,8 @@
 	/* If we have an INCOMING invite that we haven't answered, terminate that transaction */
 	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;