aboutsummaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-04-11 13:51:50 +0000
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-04-11 13:51:50 +0000
commite7f8a3292949287d27abba78eb4f9db9ecc31527 (patch)
treeafdc591d1a9d49742317832f53bc5b2f04fa5bd3 /networking
parentcc295fb2614fac59335e41256814e3f857dbda02 (diff)
downloadbusybox-e7f8a3292949287d27abba78eb4f9db9ecc31527.tar.gz
busybox-e7f8a3292949287d27abba78eb4f9db9ecc31527.tar.bz2
- httpd in inetd mode: POST from IE (6) ends up in 'cannot display page'
Closes #827
Diffstat (limited to 'networking')
-rw-r--r--networking/httpd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index 6e80fd9be..c89073a2a 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1602,11 +1602,9 @@ static void handleIncoming(void)
char *cookie = 0;
char *content_type = 0;
#endif
-#ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
fd_set s_fd;
struct timeval tv;
int retval;
-#endif
struct sigaction sa;
#ifdef CONFIG_FEATURE_HTTPD_BASIC_AUTH
@@ -1852,19 +1850,21 @@ FORBIDDEN: /* protect listing /cgi-bin */
free(config->remoteuser);
#endif
# endif
+#endif /* CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY */
shutdown(a_c_w, SHUT_WR);
/* Properly wait for remote to closed */
FD_ZERO (&s_fd) ;
- FD_SET (a_c_w, &s_fd) ;
+ FD_SET (a_c_r, &s_fd) ;
do {
tv.tv_sec = 2 ;
tv.tv_usec = 0 ;
- retval = select (a_c_w + 1, &s_fd, NULL, NULL, &tv);
- } while (retval > 0 && (read (a_c_w, buf, sizeof (config->buf)) > 0));
+ retval = select (a_c_r + 1, &s_fd, NULL, NULL, &tv);
+ } while (retval > 0 && (read (a_c_r, buf, sizeof (config->buf)) > 0));
shutdown(a_c_r, SHUT_RD);
+#ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY
close(config->accepted_socket);
#endif /* CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY */
}