[asterisk-commits] tilghman: branch 1.6.1 r156757 - in /branches/1.6.1: ./ apps/app_while.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Nov 13 18:44:10 2008
New Revision: 156757

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

................
  r156756 | tilghman | 2008-11-13 18:43:13 -0600 (Thu, 13 Nov 2008) | 13 lines
  
  Merged revisions 156755 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r156755 | tilghman | 2008-11-13 18:41:37 -0600 (Thu, 13 Nov 2008) | 6 lines
    
    ast_waitfordigit() requires that the channel be up, for no good logical
    reason.  This prevents While/EndWhile from working within the "h"
    extension.
    Reported by: jgalarneau (for ABE C.2)
    Fixed by: me
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_while.c

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

Modified: branches/1.6.1/apps/app_while.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_while.c?view=diff&rev=156757&r1=156756&r2=156757
==============================================================================
--- branches/1.6.1/apps/app_while.c (original)
+++ branches/1.6.1/apps/app_while.c Thu Nov 13 18:44:10 2008
@@ -160,11 +160,16 @@
 		return -1;
 	}
 
+#if 0
 	/* dont want run away loops if the chan isn't even up
 	   this is up for debate since it slows things down a tad ......
+
+	   Debate is over... this prevents While/EndWhile from working
+	   within the "h" extension.  Not good.
 	*/
 	if (ast_waitfordigit(chan,1) < 0)
 		return -1;
+#endif
 
 	for (x=0;;x++) {
 		if (get_index(chan, prefix, x)) {