Merged revisions 163088 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r163088 | tilghman | 2008-12-11 10:51:27 -0600 (Thu, 11 Dec 2008) | 6 lines

  Don't wait forever, if there's a specified recording timeout.
  (closes issue #13885)
   Reported by: bamby
   Patches:
         res_agi.c.patch uploaded by bamby (license 430)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@163089 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/res_agi.c b/res/res_agi.c
index 89c23cbd567b56235ce14d44bfaff203bd7cbc90..cfdd48e39d2058e9ee3f7a65358141e94b4b2d06 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1558,7 +1558,7 @@ static int handle_recordfile(struct ast_channel *chan, AGI *agi, int argc, char
 
                start = ast_tvnow();
                while ((ms < 0) || ast_tvdiff_ms(ast_tvnow(), start) < ms) {
-                       res = ast_waitfor(chan, -1);
+                       res = ast_waitfor(chan, ms - ast_tvdiff_ms(ast_tvnow(), start));
                        if (res < 0) {
                                ast_closestream(fs);
                                ast_agi_send(agi->fd, chan, "200 result=%d (waitfor) endpos=%ld\n", res,sample_offset);