diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2013-05-30 07:01:11 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2013-05-30 07:01:11 +0000 |
| commit | 3af8a100def74c906c2979ae3aad083dd74aaa1b (patch) | |
| tree | 80f5475842e97b0432a93f4875e81d71035230e0 /pjlib | |
| parent | f2d7cc657996fe0e0f5f04c45b32159557e6642c (diff) | |
Re #1664: Fixed wrong handling of poll error
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4528 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/src/pj/ioqueue_epoll.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pjlib/src/pj/ioqueue_epoll.c b/pjlib/src/pj/ioqueue_epoll.c index 8fa2f327..adc2c310 100644 --- a/pjlib/src/pj/ioqueue_epoll.c +++ b/pjlib/src/pj/ioqueue_epoll.c @@ -761,8 +761,7 @@ PJ_DEF(int) pj_ioqueue_poll( pj_ioqueue_t *ioqueue, const pj_time_val *timeout) queue[processed].key = h; queue[processed].event_type = EXCEPTION_EVENT; ++processed; - } else if (!(events[i].events & EPOLLERR) && - (key_has_pending_read(h) || key_has_pending_accept(h))) { + } else if (key_has_pending_read(h) || key_has_pending_accept(h)) { #if PJ_IOQUEUE_HAS_SAFE_UNREG increment_counter(h); #endif |