[asterisk-commits] pabelanger: branch 1.8 r302462 - in /branches/1.8: ./ res/res_timing_timerfd.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Jan 19 11:09:35 2011
New Revision: 302462

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302462
Log:
Merged revisions 302461 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r302461 | pabelanger | 2011-01-19 12:08:01 -0500 (Wed, 19 Jan 2011) | 2 lines
  
  Handle 'Resource temporarily unavailable' error more gracefully.
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/res/res_timing_timerfd.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/res/res_timing_timerfd.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_timing_timerfd.c?view=diff&rev=302462&r1=302461&r2=302462
==============================================================================
--- branches/1.8/res/res_timing_timerfd.c (original)
+++ branches/1.8/res/res_timing_timerfd.c Wed Jan 19 11:09:35 2011
@@ -165,7 +165,7 @@
 	do {
 		read_result = read(handle, &expirations, sizeof(expirations));
 		if (read_result == -1) {
-			if (errno == EINTR) {
+			if (errno == EINTR || errno == EAGAIN) {
 				continue;
 			} else {
 				ast_log(LOG_ERROR, "Read error: %s\n", strerror(errno));