From 27cf0cc76664a8c455d5cf39265bea567cc84b0a Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 18 Apr 2008 21:51:32 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114286 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/manager.c b/main/manager.c index e8b369eeb3..5d96ac8dd6 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;