diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-18 21:51:32 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-18 21:51:32 +0000 |
| commit | 17131cfe57b5b6cd95109664fd580ae5daa4c246 (patch) | |
| tree | e0cca4296b2e0a4b9c6e1056560ac86f3cce6656 /main/manager.c | |
| parent | b8377bd539b7c61757714db6e2be825533649914 (diff) | |
Merged revisions 114285 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114285 | russell | 2008-04-18 16:51:05 -0500 (Fri, 18 Apr 2008) | 10 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@114286 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
| -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 e8b369eeb..5d96ac8dd 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2778,7 +2778,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; |