[svn-commits] twilson: trunk r369581 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Jul  3 12:07:20 2012
New Revision: 369581

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369581
Log:
More improvements to re-INVITEs timing out after a provisional response

There is no need to call check_pendings() on a final response to an INVITE
when destroying the scheduler entry as it will be done later during normal
processing.

(issue ASTERISK-19992)
........

Merged revisions 369579 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 369580 from http://svn.asterisk.org/svn/asterisk/branches/10

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=369581&r1=369580&r2=369581
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Jul  3 12:07:20 2012
@@ -21315,9 +21315,6 @@
 		p->ongoing_reinvite = 0;
 		if (p->reinviteid > -1) {
 			AST_SCHED_DEL_UNREF(sched, p->reinviteid, dialog_unref(p, "unref dialog for reinvite timeout because of a final response"));
-			/* Since we got a final response to the reinvite, but were relying on the reinvite_timeout
-			 * function to clean up after the reinvite, we need to make sure and call check_pendings */
-			check_pendings(p);
 		}
 	}