mirror/darkhttpd
1
0
Fork 0
mirror of https://github.com/emikulic/darkhttpd.git synced 2023-08-10 21:13:08 +03:00
Code Issues Projects Releases Wiki Activity

. Added MAX_REQUEST_LENGTH and a check for it in poll_recv_request()

Browse Source 
. Fixed comment DEFAULT_PORT -> bindport
. "options:\n" -> "options:\n\n"
This commit is contained in:
Emil Mikulic 2003-02-27 23:41:44 +00:00
parent cb3342472b
commit 9074924be5
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
trunk/darkhttpd.c
View File

@ -61,6 +61,13 @@ struct connection
*/ */
#define IDLETIME 60 #define IDLETIME 60
/* To prevent a malformed request from eating up too much memory, die once the
* request exceeds this many bytes:
*/
#define MAX_REQUEST_LENGTH 20000
/* Defaults can be overridden on the command-line */ /* Defaults can be overridden on the command-line */
static in_addr_t bindaddr = INADDR_ANY; static in_addr_t bindaddr = INADDR_ANY;
static u_int16_t bindport = 80; static u_int16_t bindport = 80;
@ -116,8 +123,8 @@ static void init_sockin(void)
static void usage(void) static void usage(void)
{ {
printf("\n usage: darkhttpd /path/to/wwwroot [options]\n\n" printf("\n usage: darkhttpd /path/to/wwwroot [options]\n\n"
"options:\n" "options:\n\n"
"\t--port number (default: %u)\n" /* DEFAULT_PORT */ "\t--port number (default: %u)\n" /* bindport */
"\t\tSpecifies which port to listen on for connections.\n" "\t\tSpecifies which port to listen on for connections.\n"
"\n" "\n"
"\t--addr ip (default: all)\n" "\t--addr ip (default: all)\n"
@ -372,6 +379,13 @@ static void poll_recv_request(struct connection *conn)
if (conn->request_length > 4 && if (conn->request_length > 4 &&
memcmp(conn->request+conn->request_length-4, "\r\n\r\n", 4) == 0) memcmp(conn->request+conn->request_length-4, "\r\n\r\n", 4) == 0)
process_request(conn); process_request(conn);
/* die if it's too long */
if (conn->request_length > MAX_REQUEST_LENGTH)
{
default_reply(conn, 400, "Bad Request");
conn->state = SEND_HEADER;
}
} }