aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-03-02 15:02:45 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-03-02 15:02:45 +0100
commit88aa558e5cf31d1b390d68fc40f55b47beac246e (patch)
treee852c4b98e2f849fea60507363c22b39549d7601 /networking
parentd2f77796711f55240d4a88c92ea8c6545baeee98 (diff)
downloadbusybox-w32-88aa558e5cf31d1b390d68fc40f55b47beac246e.tar.gz
busybox-w32-88aa558e5cf31d1b390d68fc40f55b47beac246e.tar.bz2
busybox-w32-88aa558e5cf31d1b390d68fc40f55b47beac246e.zip
*: do not check for POLLIN/POLLOUT only, just in case it's POLHUP/POLERR
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r--networking/httpd.c6
-rw-r--r--networking/telnet.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index 5bbc7ee85..8834c1c71 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1167,7 +1167,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post
1167 break; 1167 break;
1168 } 1168 }
1169 1169
1170 if (pfd[TO_CGI].revents & POLLOUT) { 1170 if (pfd[TO_CGI].revents) {
1171 /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */ 1171 /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */
1172 /* Have data from peer and can write to CGI */ 1172 /* Have data from peer and can write to CGI */
1173 count = safe_write(toCgi_wr, hdr_ptr, hdr_cnt); 1173 count = safe_write(toCgi_wr, hdr_ptr, hdr_cnt);
@@ -1184,7 +1184,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post
1184 } 1184 }
1185 } 1185 }
1186 1186
1187 if (pfd[0].revents & POLLIN) { 1187 if (pfd[0].revents) {
1188 /* post_len > 0 && hdr_cnt == 0 here */ 1188 /* post_len > 0 && hdr_cnt == 0 here */
1189 /* We expect data, prev data portion is eaten by CGI 1189 /* We expect data, prev data portion is eaten by CGI
1190 * and there *is* data to read from the peer 1190 * and there *is* data to read from the peer
@@ -1202,7 +1202,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post
1202 } 1202 }
1203 } 1203 }
1204 1204
1205 if (pfd[FROM_CGI].revents & POLLIN) { 1205 if (pfd[FROM_CGI].revents) {
1206 /* There is something to read from CGI */ 1206 /* There is something to read from CGI */
1207 char *rbuf = iobuf; 1207 char *rbuf = iobuf;
1208 1208
diff --git a/networking/telnet.c b/networking/telnet.c
index 344bb0daa..09f75cc84 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -618,7 +618,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
618 default: 618 default:
619 619
620#ifdef USE_POLL 620#ifdef USE_POLL
621 if (ufds[0].revents & POLLIN) 621 if (ufds[0].revents)
622#else 622#else
623 if (FD_ISSET(STDIN_FILENO, &rfds)) 623 if (FD_ISSET(STDIN_FILENO, &rfds))
624#endif 624#endif
@@ -631,7 +631,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
631 } 631 }
632 632
633#ifdef USE_POLL 633#ifdef USE_POLL
634 if (ufds[1].revents & POLLIN) 634 if (ufds[1].revents)
635#else 635#else
636 if (FD_ISSET(netfd, &rfds)) 636 if (FD_ISSET(netfd, &rfds))
637#endif 637#endif