diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:24:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:24:59 +0200 |
| commit | c561994c108627c490729d98d671c45b4f9684e5 (patch) | |
| tree | a6b29ced552cba8c402af0d7401fb7ee5c569110 /tcpsrv.c | |
| parent | f4c5f0a4cc2b06865e048d7c7c716ca7ca2a3b06 (diff) | |
| parent | 28af40670e9dc1a85a24dfcbb093ddc1171e151f (diff) | |
| download | rsyslog-c561994c108627c490729d98d671c45b4f9684e5.tar.gz rsyslog-c561994c108627c490729d98d671c45b4f9684e5.tar.xz rsyslog-c561994c108627c490729d98d671c45b4f9684e5.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
tcpsrv.c
Diffstat (limited to 'tcpsrv.c')
| -rw-r--r-- | tcpsrv.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -560,6 +560,7 @@ RunSelect(tcpsrv_t *pThis) int bIsReady; tcps_sess_t *pNewSess; nssel_t *pSel = NULL; + rsRetVal localRet; ISOBJ_TYPE_assert(pThis, tcpsrv); @@ -608,8 +609,8 @@ RunSelect(tcpsrv_t *pThis) while(nfds && iTCPSess != -1) { if(glbl.GetGlobalInputTermState() == 1) ABORT_FINALIZE(RS_RET_FORCE_TERM); - CHKiRet(nssel.IsReady(pSel, pThis->pSessions[iTCPSess]->pStrm, NSDSEL_RD, &bIsReady, &nfds)); - if(bIsReady) { + localRet = nssel.IsReady(pSel, pThis->pSessions[iTCPSess]->pStrm, NSDSEL_RD, &bIsReady, &nfds); + if(bIsReady || localRet != RS_RET_OK) { doReceive(pThis, &pThis->pSessions[iTCPSess], NULL); --nfds; /* indicate we have processed one */ } |