aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-13 19:39:02 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-13 19:39:02 +0000
commitcc4170b6ec22d7ae944d47e4bcca3ca206d10a5d (patch)
tree19100ad305f0d5985c9416136893bf3d6ae9572f
parent400dc6869c8b1d587fb221864092da5de9f70d1e (diff)
Merge changes from 1.6.0 branch and update ChangeLog.v1.6.0.27-rc2
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.27-rc2@257215 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--ChangeLog12
-rw-r--r--channels/chan_sip.c2
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a930d71fa..d5331e434 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
* Asterisk 1.6.0.27-rc2 Released
+2010-04-13 [r257206] Tilghman Lesher <tlesher@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@digium.com>
* Asterisk 1.6.0.27-rc1 Released
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 86398dbae..e44be9f7d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -5220,7 +5220,7 @@ static int sip_hangup(struct ast_channel *ast)
}
} 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));
if (p->hangupcause && (res = hangup_cause2sip(p->hangupcause)))
transmit_response_reliable(p, res, &p->initreq);
else