diff options
| author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-20 20:24:36 +0000 |
|---|---|---|
| committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-20 20:24:36 +0000 |
| commit | f5f9193c1b51da43bac671b5b5cbef58061bb1bf (patch) | |
| tree | 11f298bbbe961a006c6becefc8812cb140801c90 /main | |
| parent | c8860cc4e7b3b37b367b9ba1de6cd12901ac6c75 (diff) | |
Update .version, ChangeLog, and merge changes.
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.8.3-rc2@303138 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 4 | ||||
| -rw-r--r-- | main/manager.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/features.c b/main/features.c index 2d957594f..07424a1c1 100644 --- a/main/features.c +++ b/main/features.c @@ -4108,7 +4108,7 @@ int manage_parkinglot(struct ast_parkinglot *curlot, const struct pollfd *pfds, continue; } - if (!(pfds[y].revents & (POLLIN | POLLERR))) { + if (!(pfds[y].revents & (POLLIN | POLLERR | POLLPRI))) { /* Next x */ continue; } @@ -4167,7 +4167,7 @@ std: for (x = 0; x < AST_MAX_FDS; x++) { /* mark fds for next round */ } *new_pfds = tmp; (*new_pfds)[*new_nfds].fd = chan->fds[x]; - (*new_pfds)[*new_nfds].events = POLLIN | POLLERR; + (*new_pfds)[*new_nfds].events = POLLIN | POLLERR | POLLPRI; (*new_pfds)[*new_nfds].revents = 0; (*new_nfds)++; } diff --git a/main/manager.c b/main/manager.c index b52cbd058..92edfb4ca 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4787,7 +4787,7 @@ int __ast_manager_event_multichan(int category, const char *event, int chancount struct ast_str *buf; int i; - if (!sessions && AST_RWLIST_EMPTY(&manager_hooks)) { + if (!(sessions && ao2_container_count(sessions)) && AST_RWLIST_EMPTY(&manager_hooks)) { return 0; } |