diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-29 16:43:33 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-29 16:43:33 +0000 |
| commit | 4bd6b5c20f80110cbf543c7cd228f0e5bbed995e (patch) | |
| tree | 9ed224242de8cb37ebb536c88df05c42d521d87a | |
| parent | 419789e01b3f67cfca445afe6453fa00629012f2 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@272972 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/asterisk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 67dbfa8d7..c51e8cc82 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; } |