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

@@ -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;