From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 29 Jun 2010 16:43:33 +0000 (+0000)
Subject: Merged revisions 253357 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76b06135a16aaece3e420a138cde4ffdec2f3059;p=thirdparty%2Fasterisk.git

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/
........


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

diff --git a/main/asterisk.c b/main/asterisk.c
index 67dbfa8d7b..c51e8cc82d 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2684,7 +2684,7 @@ static void ast_remotecontrol(char *data)
 		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 @@ static void ast_remotecontrol(char *data)
 				curline = nextline;
 			} while (!ast_strlen_zero(curline));
 
-			/* No non-verbose output in 500ms */
+			/* No non-verbose output in 60s */
 			if (not_written) {
 				break;
 			}