mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-12 17:55:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

httpd: get_http_headers: refactor decision for add_content_len

Browse Source
This commit is contained in:
goldsimon 2018-02-03 21:58:45 +01:00
parent 1a75112b47
commit ea2e628ac3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/apps/httpd/httpd.c
View File

@ -918,7 +918,6 @@ get_http_headers(struct http_state *hs, const char *uri)
return;
}
#endif /* LWIP_HTTPD_OMIT_HEADER_FOR_EXTENSIONLESS_URI */
add_content_len = 1;
/* Did we find a matching extension? */
if (content_type < NUM_HTTP_HEADERS) {
/* yes, store it */
@ -931,15 +930,15 @@ get_http_headers(struct http_state *hs, const char *uri)
hs->hdrs[HDR_STRINGS_IDX_CONTENT_TYPE] = HTTP_HDR_DEFAULT_TYPE;
}
/* Add content-length header? */
add_content_len = 0;
#if LWIP_HTTPD_SSI
if (hs->ssi != NULL) {
add_content_len = 0; /* @todo: get maximum file length from SSI */
} else
if (hs->ssi == NULL) /* @todo: get maximum file length from SSI */
#endif /* LWIP_HTTPD_SSI */
if ((hs->handle == NULL) ||
((hs->handle->flags & FS_FILE_FLAGS_HEADER_PERSISTENT) == 0)) {
add_content_len = 0;
{
if ((hs->handle != NULL) && (hs->handle->flags & FS_FILE_FLAGS_HEADER_PERSISTENT)) {
add_content_len = 1;
}
}
if (add_content_len) {
size_t len;
lwip_itoa(hs->hdr_content_len, (size_t)LWIP_HTTPD_MAX_CONTENT_LEN_SIZE,