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

httpd: tiny optimization

Browse Source
This commit is contained in:
Denis Vlasenko 2009-02-05 12:38:21 +00:00
parent 1cbfd98ded
commit 2ca84f6064
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
networking/httpd.c
View File

@ -1059,6 +1059,7 @@ static int get_line(void)
int count = 0; int count = 0;
char c; char c;
alarm(HEADER_READ_TIMEOUT);
while (1) { while (1) {
if (hdr_cnt <= 0) { if (hdr_cnt <= 0) {
hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof(hdr_buf)); hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof(hdr_buf));
@ -1073,7 +1074,7 @@ static int get_line(void)
continue; continue;
if (c == '\n') { if (c == '\n') {
iobuf[count] = '\0'; iobuf[count] = '\0';
return count; break;
} }
if (count < (IOBUF_SIZE - 1)) /* check overflow */ if (count < (IOBUF_SIZE - 1)) /* check overflow */
count++; count++;
@ -1739,8 +1740,8 @@ static Htaccess_Proxy *find_proxy_entry(const char *url)
/* /*
* Handle timeouts * Handle timeouts
*/ */
static void exit_on_signal(int sig) NORETURN; static void send_REQUEST_TIMEOUT_and_exit(int sig) NORETURN;
static void exit_on_signal(int sig UNUSED_PARAM) static void send_REQUEST_TIMEOUT_and_exit(int sig UNUSED_PARAM)
{ {
send_headers_and_exit(HTTP_REQUEST_TIMEOUT); send_headers_and_exit(HTTP_REQUEST_TIMEOUT);
} }
@ -1805,9 +1806,8 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
bb_error_msg("connected"); bb_error_msg("connected");
} }
/* Install timeout handler */ /* Install timeout handler. get_line() needs it. */
signal_no_SA_RESTART_empty_mask(SIGALRM, exit_on_signal); signal(SIGALRM, send_REQUEST_TIMEOUT_and_exit);
alarm(HEADER_READ_TIMEOUT);
if (!get_line()) /* EOF or error or empty line */ if (!get_line()) /* EOF or error or empty line */
send_headers_and_exit(HTTP_BAD_REQUEST); send_headers_and_exit(HTTP_BAD_REQUEST);
@ -1934,7 +1934,6 @@ static void handle_incoming_and_exit(const len_and_sockaddr *fromAddr)
/* Read until blank line for HTTP version specified, else parse immediate */ /* Read until blank line for HTTP version specified, else parse immediate */
while (1) { while (1) {
alarm(HEADER_READ_TIMEOUT);
if (!get_line()) if (!get_line())
break; /* EOF or error or empty line */ break; /* EOF or error or empty line */
if (DEBUG) if (DEBUG)