[svn-commits] russell: branch 1.6.2 r272972 - in /branches/1.6.2: ./ main/asterisk.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jun 29 11:43:33 2010
New Revision: 272972

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

........
  r253357 | russell | 2010-03-18 13:18:43 -0500 (Thu, 18 Mar 2010) | 8 lines
  
  Increase CLI command output timeout for asterisk -rx to 60 seconds.
  
  (closes issue #17049)
  Reported by: russell
  Tested by: russell
  
  Review: https://reviewboard.asterisk.org/r/573/
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/asterisk.c

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

Modified: branches/1.6.2/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/asterisk.c?view=diff&rev=272972&r1=272971&r2=272972
==============================================================================
--- branches/1.6.2/main/asterisk.c (original)
+++ branches/1.6.2/main/asterisk.c Tue Jun 29 11:43:33 2010
@@ -2684,7 +2684,7 @@
 		fds.fd = ast_consock;
 		fds.events = POLLIN;
 		fds.revents = 0;
-		while (ast_poll(&fds, 1, 500) > 0) {
+		while (ast_poll(&fds, 1, 60000) > 0) {
 			char buffer[512] = "", *curline = buffer, *nextline;
 			int not_written = 1;
 
@@ -2713,7 +2713,7 @@
 				curline = nextline;
 			} while (!ast_strlen_zero(curline));
 
-			/* No non-verbose output in 500ms */
+			/* No non-verbose output in 60s */
 			if (not_written) {
 				break;
 			}