[svn-commits] tilghman: branch 1.6.1 r163091 - in /branches/1.6.1: ./ res/res_agi.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Dec 11 10:54:04 2008
New Revision: 163091

URL: http://svn.digium.com/view/asterisk?view=rev&rev=163091
Log:
Merged revisions 163089 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r163089 | tilghman | 2008-12-11 10:52:24 -0600 (Thu, 11 Dec 2008) | 13 lines
  
  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)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_agi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/res/res_agi.c?view=diff&rev=163091&r1=163090&r2=163091
==============================================================================
--- branches/1.6.1/res/res_agi.c (original)
+++ branches/1.6.1/res/res_agi.c Thu Dec 11 10:54:04 2008
@@ -1316,7 +1316,7 @@
 
 		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);