[svn-commits] oej: trunk r128927 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: oej
Date: Tue Jul  8 04:26:37 2008
New Revision: 128927

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128927
Log:
Merged revisions 128912 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r128912 | oej | 2008-07-08 11:06:08 +0200 (Tis, 08 Jul 2008) | 7 lines

Fix issues where repeated messages where ignored, but retransmitted reliably instead of unreliably.
Reported by: johan
Patches: 
      12746.txt uploaded by oej (license 306)
Tested by: johan
(issue #12746)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=128927&r1=128926&r2=128927
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Jul  8 04:26:37 2008
@@ -17073,8 +17073,8 @@
 			else
 				ast_debug(2, "Got a SIP re-transmit of INVITE for call %s\n", p->callid);
 		}
-
-		reinvite = 1;
+		if (!req->ignore)
+			reinvite = 1;
 		c = p->owner;
 	}