[svn-commits] oej: branch 1.6.0 r128933 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: oej
Date: Tue Jul  8 04:28:56 2008
New Revision: 128933

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

................
r128927 | oej | 2008-07-08 11:26:37 +0200 (Tis, 08 Jul 2008) | 15 lines

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:
    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=128933&r1=128932&r2=128933
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Jul  8 04:28:56 2008
@@ -16563,8 +16563,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;
 	}