Lab
/
libuhttpd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimize code 

Signed-off-by: Jianhui Zhao <jianhuizhao329@gmail.com>
main
Jianhui Zhao 2017-11-13 21:20:42 +08:00
parent 93be87f5ce
commit bd8ec5f31d
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/uhttp.c
View File

@ -275,7 +275,7 @@ handshake_done:
if (!(con->flags & UH_CON_PARSERING)) {
if (!memmem(buf->base, buf->len, "\r\n\r\n", 4)) {
if (buf->len > UH_MAX_HTTP_HEAD_SIZE) {
if (buf->len > UH_HEAD_SIZE_LIMIT) {
uh_log_err("HTTP head size too big");
uh_send_error(con, UH_STATUS_BAD_REQUEST, NULL);
}
@ -288,12 +288,17 @@ handshake_done:
}
parsered = http_parser_execute(&con->parser, &parser_settings, base, len);
if (unlikely(parsered != len && !(con->flags & UH_CON_CLOSE))) {
uh_log_err("http parser failed:%s", http_errno_description(HTTP_PARSER_ERRNO(&con->parser)));
if (unlikely(con->flags & UH_CON_CLOSE))
return;
if (unlikely(parsered != len)) {
uh_log_err("http_parser_execute() failed:%s", http_errno_description(HTTP_PARSER_ERRNO(&con->parser)));
uh_send_error(con, UH_STATUS_BAD_REQUEST, NULL);
} else {
ev_timer_mode(loop, &con->timer_watcher, UH_CONNECTION_TIMEOUT, 0);
return;
}
ev_timer_mode(loop, &con->timer_watcher, UH_CONNECTION_TIMEOUT, 0);
}
static void connection_write_cb(struct ev_loop *loop, ev_io *w, int revents)

12
src/uhttp_internal.h
View File

@ -6,11 +6,11 @@
#include "list.h"
#include "uhttp.h"
#define UH_BUFFER_SIZE 2048
#define UH_CONNECTION_TIMEOUT 30
#define UH_MAX_HTTP_HEAD_SIZE 1024
#define UH_MAX_HTTP_BODY_SIZE (2 * 1024 * 1024)
#define UH_MAX_HTTP_HEADERS 20
#define UH_BUFFER_SIZE 2048
#define UH_CONNECTION_TIMEOUT 30
#define UH_HEAD_SIZE_LIMIT 1024
#define UH_BODY_SIZE_LIMIT (2 * 1024 * 1024)
#define UH_HEADER_NUM_LIMIT 20
#define UH_CON_CLOSE (1 << 0)
#define UH_CON_SSL_HANDSHAKE_DONE (1 << 1) /* SSL hanshake has completed */
@ -51,7 +51,7 @@ struct uh_request {
struct uh_value url;
struct uh_value body;
int header_num;
struct uh_header header[UH_MAX_HTTP_HEADERS];
struct uh_header header[UH_HEADER_NUM_LIMIT];
};
struct uh_connection {