From fed10ed35da5eb7c4db642b959b9fc5f27786878 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Thu, 3 Feb 2011 20:51:09 +0000 Subject: [PATCH] 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) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306125 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/features.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/features.c b/main/features.c index f35a2475a8..44f0eb8296 100644 --- a/main/features.c +++ b/main/features.c @@ -4133,7 +4133,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);