diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-04-18 21:51:05 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-04-18 21:51:05 +0000 |
| commit | 0bb3c1560617d2f381c12840809226bef4f70d7b (patch) | |
| tree | 3d74240466736ed823a30313f89b8d4574b34408 /main | |
| parent | d02badd56161fc470cb3c122dda21ca57b2233f4 (diff) | |
Merged revisions 114284 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114284 | russell | 2008-04-18 16:48:06 -0500 (Fri, 18 Apr 2008) | 2 lines
Don't destroy a manager session if poll() returns an error of EAGAIN.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 69a889b6d..8825010e0 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2847,7 +2847,7 @@ static int get_input(struct mansession *s, char *output) /* If we get a signal from some other thread (typically because * there are new events queued), return 0 to notify the caller. */ - if (errno == EINTR) + if (errno == EINTR || errno == EAGAIN) return 0; ast_log(LOG_WARNING, "poll() returned error: %s\n", strerror(errno)); return -1; |