[svn-commits] jpeeler: branch 1.8 r306124 - in /branches/1.8: ./ main/features.c

SVN commits to the Digium repositories svn-commits at lists.digium.com
Thu Feb 3 14:50:52 CST 2011


Author: jpeeler
Date: Thu Feb  3 14:50:48 2011
New Revision: 306124

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306124
Log:
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:
    branches/1.8/   (props changed)
    branches/1.8/main/features.c

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

Modified: branches/1.8/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/features.c?view=diff&rev=306124&r1=306123&r2=306124
==============================================================================
--- branches/1.8/main/features.c (original)
+++ branches/1.8/main/features.c Thu Feb  3 14:50:48 2011
@@ -4121,7 +4121,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);




More information about the svn-commits mailing list