diff options
author | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
---|---|---|
committer | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
commit | 1212906351c3f4f5f759396c32b5e1dbabd403a4 (patch) | |
tree | 285c7eea05e3b246fe9560fae93d9d79dd5f2ad0 /channels/chan_sip.c | |
parent | fc70db3a810dae81e0ba0e09ecf11468bbef4d54 (diff) |
Reverting r403311. It's causing ARI tests to hang.
........
Merged revisions 403398 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index fafe71257..c56f7c4c9 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8106,7 +8106,6 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit } } - ast_channel_lock(tmp); ast_channel_stage_snapshot(tmp); /* If we sent in a callid, bind it to the channel. */ @@ -8114,6 +8113,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit ast_channel_callid_set(tmp, callid); } + ast_channel_lock(tmp); sip_pvt_lock(i); ast_channel_cc_params_init(tmp, i->cc_params); ast_channel_caller(tmp)->id.tag = ast_strdup(i->cid_tag); |