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 67dbfa8d7b23ea9f0938a007e5dacf0bf53aaec9..c51e8cc82deaa0422cd229000ecd47e8324040a9 100644 (file)
--- 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;
                        }