[asterisk-commits] pabelanger: trunk r302463 - in /trunk: ./ res/res_timing_timerfd.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Jan 19 11:15:40 2011
New Revision: 302463

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

................
  r302462 | pabelanger | 2011-01-19 12:09:35 -0500 (Wed, 19 Jan 2011) | 9 lines
  
  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:
    trunk/   (props changed)
    trunk/res/res_timing_timerfd.c

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

Modified: trunk/res/res_timing_timerfd.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_timing_timerfd.c?view=diff&rev=302463&r1=302462&r2=302463
==============================================================================
--- trunk/res/res_timing_timerfd.c (original)
+++ trunk/res/res_timing_timerfd.c Wed Jan 19 11:15:40 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));