emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

httpd: fix obscure case when user runs httpd -i from command line for testing.

Browse Source 
(fixes bug 3334)

function                                             old     new   delta
httpd_main                                           743     757     +14
handle_incoming_and_exit                            2657    2669     +12
log_and_exit                                          75      43     -32
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 26/-32)             Total: -6 bytes
This commit is contained in:
Denis Vlasenko
2008-05-18 15:14:36 +00:00
parent 9ddc8d54d1
commit faf334aeb8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
networking/httpd.c
View File

@@ -944,9 +944,12 @@ static void log_and_exit(void)
/* Paranoia. IE said to be buggy. It may send some extra data /* Paranoia. IE said to be buggy. It may send some extra data
* or be confused by us just exiting without SHUT_WR. Oh well. */ * or be confused by us just exiting without SHUT_WR. Oh well. */
shutdown(1, SHUT_WR); shutdown(1, SHUT_WR);
/* Why??
(this also messes up stdin when user runs httpd -i from terminal)
ndelay_on(0); ndelay_on(0);
while (read(0, iobuf, IOBUF_SIZE) > 0) while (read(0, iobuf, IOBUF_SIZE) > 0)
continue; continue;
*/
if (verbose > 2) if (verbose > 2)
bb_error_msg("closed"); bb_error_msg("closed");
@@ -1821,11 +1824,13 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]); rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]);
#endif #endif
if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) { if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) {
/* NB: can be NULL (user runs httpd -i by hand?) */
rmt_ip_str = xmalloc_sockaddr2dotted(&fromAddr->u.sa); rmt_ip_str = xmalloc_sockaddr2dotted(&fromAddr->u.sa);
} }
if (verbose) { if (verbose) {
/* this trick makes -v logging much simpler */ /* this trick makes -v logging much simpler */
applet_name = rmt_ip_str; if (rmt_ip_str)
applet_name = rmt_ip_str;
if (verbose > 2) if (verbose > 2)
bb_error_msg("connected"); bb_error_msg("connected");
} }
@@ -2255,7 +2260,9 @@ static void mini_httpd_inetd(void)
{ {
len_and_sockaddr fromAddr; len_and_sockaddr fromAddr;
memset(&fromAddr, 0, sizeof(fromAddr));
fromAddr.len = LSA_SIZEOF_SA; fromAddr.len = LSA_SIZEOF_SA;
/* NB: can fail if user runs it by hand and types in http cmds */
getpeername(0, &fromAddr.u.sa, &fromAddr.len); getpeername(0, &fromAddr.u.sa, &fromAddr.len);
handle_incoming_and_exit(&fromAddr); handle_incoming_and_exit(&fromAddr);
} }