Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-11-19 23:31:39 +00:00
Code Issues Projects Releases Wiki Activity

httpd: make sire pfd[TO_CGI].revents is cleared before poll()

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2013-09-18 12:08:41 +02:00
parent d7ea34ee71
commit a6ed6a3148
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
networking/httpd.c
View File

@ -1104,23 +1104,31 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post
/* NB: breaking out of this loop jumps to log_and_exit() */ /* NB: breaking out of this loop jumps to log_and_exit() */
out_cnt = 0; out_cnt = 0;
pfd[FROM_CGI].fd = fromCgi_rd;
pfd[FROM_CGI].events = POLLIN;
pfd[TO_CGI].fd = toCgi_wr;
while (1) { while (1) {
/* Note: even pfd[0].events == 0 won't prevent /* Note: even pfd[0].events == 0 won't prevent
* revents == POLLHUP|POLLERR reports from closed stdin. * revents == POLLHUP|POLLERR reports from closed stdin.
* This works: */ * Setting fd to -1 works: */
pfd[0].fd = -1; pfd[0].fd = -1;
pfd[0].events = POLLIN;
pfd[0].revents = 0; /* probably not needed, paranoia */
pfd[FROM_CGI].fd = fromCgi_rd; /* We always poll this fd, thus kernel always sets revents: */
pfd[FROM_CGI].events = POLLIN; /*pfd[FROM_CGI].events = POLLIN; - moved out of loop */
/*pfd[FROM_CGI].revents = 0; - not needed */
pfd[TO_CGI].fd = toCgi_wr; /* gcc-4.8.0 still doesnt fill two shorts with one insn :( */
/* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47059 */
/* hopefully one day it will... */
pfd[TO_CGI].events = POLLOUT; pfd[TO_CGI].events = POLLOUT;
pfd[TO_CGI].revents = 0; /* needed! */
if (toCgi_wr && hdr_cnt <= 0) { if (toCgi_wr && hdr_cnt <= 0) {
if (post_len > 0) { if (post_len > 0) {
/* Expect more POST data from network */ /* Expect more POST data from network */
pfd[0].fd = 0; pfd[0].fd = 0;
pfd[0].events = POLLIN;
} else { } else {
/* post_len <= 0 && hdr_cnt <= 0: /* post_len <= 0 && hdr_cnt <= 0:
* no more POST data to CGI, * no more POST data to CGI,