aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-03 20:49:48 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-03 20:49:48 +0000
commit548744813f09d5a2d5c2b90020b815f56b47b3c2 (patch)
tree2a0002fc9b3572400c441c4278d5dd4d97b9d991
parent6a42b6aa2c6a4b659923f1147e4648e30c713a7e (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@306123 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/features.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c
index a9091383e..10a4bdf5d 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3493,7 +3493,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);