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

conn_get_header: return NULL if not found 

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
main
Jianhui Zhao 2020-07-02 22:26:00 +08:00
parent 2844706996
commit 162b8fe4f2
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/connection.c
View File

@ -212,7 +212,7 @@ static const char *conn_get_header(struct uh_connection *conn, const char *name)
} }
if (i == UHTTPD_MAX_HEADER_NUM) if (i == UHTTPD_MAX_HEADER_NUM)
return ""; return NULL;
for (j = 0; j < UHTTPD_MAX_HEADER_NUM; j++) { for (j = 0; j < UHTTPD_MAX_HEADER_NUM; j++) {
if (req->headers_info[j].name_offset > 0) { if (req->headers_info[j].name_offset > 0) {
@ -226,7 +226,7 @@ static const char *conn_get_header(struct uh_connection *conn, const char *name)
} }
} }
return ""; return NULL;
} }
static const char *conn_get_body(struct uh_connection *conn, int *len) static const char *conn_get_body(struct uh_connection *conn, int *len)

7
src/file.c
View File

@ -88,7 +88,7 @@ static void file_response_304(struct uh_connection *conn, struct stat *s)
static bool file_if_modified_since(struct uh_connection *conn, struct stat *s) static bool file_if_modified_since(struct uh_connection *conn, struct stat *s)
{ {
const char *hdr = conn->get_header(conn, "If-Modified-Since"); const char *hdr = conn->get_header(conn, "If-Modified-Since");
if (!hdr[0]) if (!hdr)
return true; return true;
if (date2unix(hdr) >= s->st_mtime) { if (date2unix(hdr) >= s->st_mtime) {
@ -101,8 +101,7 @@ static bool file_if_modified_since(struct uh_connection *conn, struct stat *s)
static bool file_if_range(struct uh_connection *conn, struct stat *s) static bool file_if_range(struct uh_connection *conn, struct stat *s)
{ {
const char *hdr = conn->get_header(conn, "If-Range"); if (conn->get_header(conn, "If-Range")) {
if (hdr[0]) {
conn->error(conn, HTTP_STATUS_PRECONDITION_FAILED, NULL); conn->error(conn, HTTP_STATUS_PRECONDITION_FAILED, NULL);
return false; return false;
} }
@ -113,7 +112,7 @@ static bool file_if_range(struct uh_connection *conn, struct stat *s)
static bool file_if_unmodified_since(struct uh_connection *conn, struct stat *s) static bool file_if_unmodified_since(struct uh_connection *conn, struct stat *s)
{ {
const char *hdr = conn->get_header(conn, "If-Modified-Since"); const char *hdr = conn->get_header(conn, "If-Modified-Since");
if (hdr[0] && date2unix(hdr) <= s->st_mtime) { if (hdr && date2unix(hdr) <= s->st_mtime) {
conn->error(conn, HTTP_STATUS_PRECONDITION_FAILED, NULL); conn->error(conn, HTTP_STATUS_PRECONDITION_FAILED, NULL);
return false; return false;
} }