From 3af8a100def74c906c2979ae3aad083dd74aaa1b Mon Sep 17 00:00:00 2001 From: Liong Sauw Ming Date: Thu, 30 May 2013 07:01:11 +0000 Subject: Re #1664: Fixed wrong handling of poll error git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4528 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/src/pj/ioqueue_epoll.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pjlib') 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 -- cgit v1.2.3