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 /funcs/func_timeout.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 'funcs/func_timeout.c')
| -rw-r--r-- | funcs/func_timeout.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c index e93ce3f62..3c2810fd5 100644 --- a/funcs/func_timeout.c +++ b/funcs/func_timeout.c @@ -155,9 +155,7 @@ static int timeout_write(struct ast_channel *chan, const char *cmd, char *data, switch (*data) { case 'a': case 'A': - ast_channel_lock(chan); ast_channel_setwhentohangup_tv(chan, when); - ast_channel_unlock(chan); if (!ast_tvzero(*ast_channel_whentohangup(chan))) { when = ast_tvadd(when, ast_tvnow()); ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S.%3q %Z", |