kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 02:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting r403311. It's causing ARI tests to hang.

Browse Source 
........

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
This commit is contained in:
David M. Lee
2013-12-05 22:10:20 +00:00
parent fc70db3a81
commit 1212906351
57 changed files with 31 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
funcs/func_timeout.c
View File

@@ -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",