From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 3 Feb 2011 20:50:48 +0000 (+0000)
Subject: Merged revisions 306123 via svnmerge from
X-Git-Tag: 1.8.4-rc1~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ff827384056cbacf72c4cba533f0fa47f501ea2;p=thirdparty%2Fasterisk.git

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)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@306124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index 563d7d14cc..8df3bf1998 100644
--- a/main/features.c
+++ b/main/features.c
@@ -4121,7 +4121,7 @@ int manage_parkinglot(struct ast_parkinglot *curlot, const struct pollfd *pfds,
 					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);