diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-03 20:51:09 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-03 20:51:09 +0000 |
| commit | cf8e0f5f62072b6b3f62d7c10ad855aa64615f65 (patch) | |
| tree | 684ee7939e971d98fc5e4084254a6ef415c47edd | |
| parent | 058bdd04696f7c1119335868114e1d2013488877 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@306125 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index f35a2475a..44f0eb829 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); |