]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Set exception on channel in parking thread when POLLPRI event detected.
authorJeff Peeler <jpeeler@digium.com>
Thu, 3 Feb 2011 20:49:48 +0000 (20:49 +0000)
committerJeff Peeler <jpeeler@digium.com>
Thu, 3 Feb 2011 20:49:48 +0000 (20:49 +0000)
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.6.2@306123 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

index a9091383eb5702614abb49fe3772977404bbc1d8..10a4bdf5d6040a9e7cf0d4d10ee0b99ee7415a38 100644 (file)
@@ -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);