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

httpd shrink and logging update, part 4 of 7

Browse Source 
text    data     bss     dec     hex filename
   9836       0       0    9836    266c busybox.t1/networking/httpd.o.orig
   9724       0       0    9724    25fc busybox.t2/networking/httpd.o
   9657       0       0    9657    25b9 busybox.t3/networking/httpd.o
   9342       0       0    9342    247e busybox.t4/networking/httpd.o
   9342       0       0    9342    247e busybox.t5/networking/httpd.o
   9262       0       0    9262    242e busybox.t6/networking/httpd.o
   9283       0       0    9283    2443 busybox.t7/networking/httpd.o
   9334       0       0    9334    2476 busybox.t8/networking/httpd.o
This commit is contained in:
Denis Vlasenko 2007-08-17 19:19:42 +00:00
parent e45af73dc2
commit 91adf7d587
1 changed files with 185 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
networking/httpd.c
View File

@ -1542,7 +1542,6 @@ static void handle_incoming_and_exit(void)
char *content_type = 0; char *content_type = 0;
#endif #endif
struct sigaction sa; struct sigaction sa;
#if ENABLE_FEATURE_HTTPD_BASIC_AUTH #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
int credentials = -1; /* if not required this is Ok */ int credentials = -1; /* if not required this is Ok */
#endif #endif
@ -1552,9 +1551,6 @@ static void handle_incoming_and_exit(void)
sa.sa_flags = 0; /* no SA_RESTART */ sa.sa_flags = 0; /* no SA_RESTART */
sigaction(SIGALRM, &sa, NULL); sigaction(SIGALRM, &sa, NULL);
/* It's not a real loop (it ends with while(0)).
* Break from this "loop" jumps to exit(0) */
do {
alarm(TIMEOUT); alarm(TIMEOUT);
if (!get_line()) if (!get_line())
_exit(0); /* EOF or error or empty line */ _exit(0); /* EOF or error or empty line */
@ -1641,6 +1637,7 @@ static void handle_incoming_and_exit(void)
found_moved_temporarily = url; found_moved_temporarily = url;
} }
} }
if (verbose > 1) if (verbose > 1)
bb_error_msg("url:%s", url); bb_error_msg("url:%s", url);
@ -1709,6 +1706,7 @@ static void handle_incoming_and_exit(void)
#endif /* FEATURE_HTTPD_BASIC_AUTH */ #endif /* FEATURE_HTTPD_BASIC_AUTH */
} /* while extra header reading */ } /* while extra header reading */
} }
alarm(0); alarm(0);
if (strcmp(bb_basename(url), httpd_conf) == 0 || ip_allowed == 0) { if (strcmp(bb_basename(url), httpd_conf) == 0 || ip_allowed == 0) {
@ -1771,10 +1769,8 @@ static void handle_incoming_and_exit(void)
} }
} }
#endif /* FEATURE_HTTPD_CGI */ #endif /* FEATURE_HTTPD_CGI */
send_file_and_exit(test);
} while (0);
_exit(0); send_file_and_exit(test);
#if 0 /* Is this needed? Why? */ #if 0 /* Is this needed? Why? */
if (DEBUG) if (DEBUG)
@ -1817,7 +1813,6 @@ static void handle_incoming_and_exit(void)
static void mini_httpd(int server) ATTRIBUTE_NORETURN; static void mini_httpd(int server) ATTRIBUTE_NORETURN;
static void mini_httpd(int server) static void mini_httpd(int server)
{ {
/* copy the ports we are watching to the readfd set */
while (1) { while (1) {
int n; int n;
len_and_sockaddr fromAddr; len_and_sockaddr fromAddr;