aboutsummaryrefslogtreecommitdiff
path: root/networking/httpd.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:09:59 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:09:59 +0000
commit5d61e71c3a8ac3296afbfe9a014c62050c5a9234 (patch)
treee9ab2cd35d1f2d51b26a678551a0439b1719928b /networking/httpd.c
parentc9dc2ac578278e86be248cc21e53081f7054da83 (diff)
downloadbusybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.gz
busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.tar.bz2
busybox-w32-5d61e71c3a8ac3296afbfe9a014c62050c5a9234.zip
introduce safe_poll (fixes a problem in top)
function old new delta safe_poll - 77 +77 svlogd_main 1470 1466 -4 zcip_main 1530 1524 -6 forkexec 1345 1338 -7 decode_format_string 795 788 -7 collect_blk 474 467 -7 buffer_pread 540 532 -8 tftp 1182 1172 -10 microcom_main 763 749 -14 arpping 441 424 -17 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 0/9 up/down: 77/-80) Total: -3 bytes text data bss dec hex filename 770162 1034 10404 781600 bed20 busybox_old 770158 1034 10404 781596 bed1c busybox_unstripped
Diffstat (limited to 'networking/httpd.c')
-rw-r--r--networking/httpd.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index cedec800f..92a07107d 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1073,13 +1073,9 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post
1073 } 1073 }
1074 1074
1075 /* Now wait on the set of sockets */ 1075 /* Now wait on the set of sockets */
1076 count = poll(pfd, 3, -1); 1076 count = safe_poll(pfd, 3, -1);
1077 if (count <= 0) { 1077 if (count <= 0) {
1078#if 0 1078#if 0
1079 if (errno == EINTR)
1080 continue;
1081#endif
1082#if 0
1083 if (waitpid(pid, &status, WNOHANG) <= 0) { 1079 if (waitpid(pid, &status, WNOHANG) <= 0) {
1084 /* Weird. CGI didn't exit and no fd's 1080 /* Weird. CGI didn't exit and no fd's
1085 * are ready, yet poll returned?! */ 1081 * are ready, yet poll returned?! */