[asterisk-commits] jpeeler: trunk r306125 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Feb  3 14:51:09 2011
New Revision: 306125

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

................
  r306124 | jpeeler | 2011-02-03 14:50:48 -0600 (Thu, 03 Feb 2011) | 17 lines
  
  Merged revisions 306123 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r306123 | jpeeler | 2011-02-03 14:49:48 -0600 (Thu, 03 Feb 2011) | 10 lines
    
    Set exception on channel in parking thread when POLLPRI event detected.
    
    This is done just to make the code be equivalent to the old select code. As
    noted in 303106 the same issue was already fixed in this branch, but the
    exception was not set on the channel in the case of POLLPRI. The reason that
    this did not cause a problem here is because in 122923 the check in __ast_read
    to check the exception flag was removed.
    
    (related to #18637)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/features.c

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

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=306125&r1=306124&r2=306125
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Thu Feb  3 14:51:09 2011
@@ -4133,7 +4133,7 @@
 					continue;
 				}
 
-				if (pfds[y].revents & POLLERR) {
+				if (pfds[y].revents & POLLPRI) {
 					ast_set_flag(chan, AST_FLAG_EXCEPTION);
 				} else {
 					ast_clear_flag(chan, AST_FLAG_EXCEPTION);