[asterisk-commits] lmadsen: tag 1.6.1.19-rc2 r257216 - in /tags/1.6.1.19-rc2: ./ channels/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue Apr 13 14:41:22 2010
New Revision: 257216

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=257216
Log:
Merge changes from 1.6.1 branch and update ChangeLog.

Modified:
    tags/1.6.1.19-rc2/ChangeLog
    tags/1.6.1.19-rc2/channels/chan_sip.c

Modified: tags/1.6.1.19-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.1.19-rc2/ChangeLog?view=diff&rev=257216&r1=257215&r2=257216
==============================================================================
--- tags/1.6.1.19-rc2/ChangeLog (original)
+++ tags/1.6.1.19-rc2/ChangeLog Tue Apr 13 14:41:22 2010
@@ -1,6 +1,18 @@
 2010-04-13  Leif Madsen <lmadsen at digium.com>
 
 	* Asterisk 1.6.1.19-rc2 Released
+
+2010-04-13 [r257208]  Tilghman Lesher <tlesher at digium.com
+
+	Also unref the pvt when we delete the provisional keepalive job.
+
+	(closes issue #16774)
+	 Reported by: kowalma
+	 Patches: 
+	       20100315__issue16774.diff.txt uploaded by tilghman (license 14)
+	 Tested by: falves11, jamicque
+
+	Review: https://reviewboard.asterisk.org/r/591/
 
 2010-04-05  Leif Madsen <lmadsen at digium.com>
 

Modified: tags/1.6.1.19-rc2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.1.19-rc2/channels/chan_sip.c?view=diff&rev=257216&r1=257215&r2=257216
==============================================================================
--- tags/1.6.1.19-rc2/channels/chan_sip.c (original)
+++ tags/1.6.1.19-rc2/channels/chan_sip.c Tue Apr 13 14:41:22 2010
@@ -5667,7 +5667,7 @@
 				}
 			} else {	/* Incoming call, not up */
 				const char *res;
-				AST_SCHED_DEL(sched, p->provisional_keepalive_sched_id);
+				AST_SCHED_DEL_UNREF(sched, p->provisional_keepalive_sched_id, dialog_unref(p, "when you delete the provisional_keepalive_sched_id, you should dec the refcount for the stored dialog ptr"));
 				if (p->hangupcause && (res = hangup_cause2sip(p->hangupcause)))
 					transmit_response_reliable(p, res, &p->initreq);
 				else