[asterisk-commits] russell: branch 1.6.0 r114286 - in /branches/1.6.0: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Apr 18 16:51:32 2008
New Revision: 114286

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114286
Log:
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.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/manager.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=114286&r1=114285&r2=114286
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Fri Apr 18 16:51:32 2008
@@ -2778,7 +2778,7 @@
 		/* 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;