OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix order problem that was causing dup2 to clobber pipe FD and hang 

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2046 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-09-13 16:16:24 +00:00
parent 8468ddf520
commit 0e88518cb4
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netutils/thttpd/thttpd_cgi.c
View File

@ -660,16 +660,18 @@ static int cgi_child(int argc, char **argv)
argp = make_argp(hc);
/* Close all file descriptors (including stdio, stdin, stdout) EXCEPT for
* stderr and hc->conn_fd
/* Close all file descriptors EXCEPT for stdin, stdout, stderr and
* hc->conn_fd. We'll keep stderr open for error reporting; stdin and
* stdout will be closed later by dup2(). Keeping stdin and stdout open
* now prevents re-use of fd=0 and 1 by pipe().
*/
nllvdbg("Closing all descriptors\n");
for (fd = 0; fd < (CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS); fd++)
nllvdbg("Closing descriptors\n");
for (fd = 3; fd < (CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS); fd++)
{
/* Keep stderr open for debug; keep hc->conn_fd open for obvious reasons */
/* Keep hc->conn_fd open for obvious reasons */
if (fd != 2 && fd != hc->conn_fd)
if (fd != hc->conn_fd)
{
close(fd);
}
@ -939,4 +941,5 @@ int cgi(httpd_conn *hc)
return 0;
}
#endif /* CONFIG_THTTPD && CONFIG_THTTPD_CGI_PATTERN */
#endif /* CONFIG_THTTPD && CONFIG_THTTPD_CGI_PATTERN */