|
@@ -970,13 +970,13 @@ again:
|
|
con, con->id, atomic_get(&con->refcnt));
|
|
con, con->id, atomic_get(&con->refcnt));
|
|
goto read_error;
|
|
goto read_error;
|
|
}
|
|
}
|
|
|
|
+ read_flags=((
|
|
#ifdef POLLRDHUP
|
|
#ifdef POLLRDHUP
|
|
- read_flags=(((events & POLLRDHUP) |
|
|
|
|
|
|
+ (events & POLLRDHUP) |
|
|
|
|
+#endif /* POLLRDHUP */
|
|
|
|
+ (events & (POLLHUP|POLLERR)) |
|
|
(con->flags & (F_CONN_EOF_SEEN|F_CONN_FORCE_EOF)))
|
|
(con->flags & (F_CONN_EOF_SEEN|F_CONN_FORCE_EOF)))
|
|
&& !(events & POLLPRI))? RD_CONN_FORCE_EOF: 0;
|
|
&& !(events & POLLPRI))? RD_CONN_FORCE_EOF: 0;
|
|
-#else /* POLLRDHUP */
|
|
|
|
- read_flags=0;
|
|
|
|
-#endif /* POLLRDHUP */
|
|
|
|
resp=tcp_read_req(con, &ret, &read_flags);
|
|
resp=tcp_read_req(con, &ret, &read_flags);
|
|
if (unlikely(resp<0)){
|
|
if (unlikely(resp<0)){
|
|
read_error:
|
|
read_error:
|