mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-11-06 02:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

httpd: create "connection" and "content-length" headers when file is ready

Browse Source 
see patch #9500
This commit is contained in:
goldsimon 2018-02-07 21:27:42 +01:00
parent e8d7e82c8c
commit f7be3d10ae
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -835,7 +835,6 @@ get_http_headers(struct http_state *hs, const char *uri)
char *tmp;
char *ext;
char *vars;
u8_t add_content_len;
/* In all cases, the second header we send is the server identification
so set it here. */
@ -929,7 +928,19 @@ get_http_headers(struct http_state *hs, const char *uri)
/* No - use the default, plain text file type. */
hs->hdrs[HDR_STRINGS_IDX_CONTENT_TYPE] = HTTP_HDR_DEFAULT_TYPE;
}
/* Set up to send the first header string. */
hs->hdr_index = 0;
hs->hdr_pos = 0;
}
/* Add content-length header? */
static void
get_http_content_length(struct http_state *hs)
{
u8_t add_content_len = 0;
LWIP_ASSERT("already been here?", hs->hdrs[HDR_STRINGS_IDX_CONTENT_LEN_KEEPALIVE] == NULL);
add_content_len = 0;
#if LWIP_HTTPD_SSI
if (hs->ssi == NULL) /* @todo: get maximum file length from SSI */
@ -963,10 +974,6 @@ get_http_headers(struct http_state *hs, const char *uri)
hs->hdrs[HDR_STRINGS_IDX_CONTENT_LEN_KEEPALIVE] = g_psHTTPHeaderStrings[HTTP_HDR_CONTENT_LENGTH];
}
#endif /* LWIP_HTTPD_SUPPORT_11_KEEPALIVE */
/* Set up to send the first header string. */
hs->hdr_index = 0;
hs->hdr_pos = 0;
}
/** Sub-function of http_send(): send dynamic headers
@ -985,6 +992,11 @@ http_send_headers(struct altcp_pcb *pcb, struct http_state *hs)
u8_t data_to_send = HTTP_NO_DATA_TO_SEND;
u16_t hdrlen, sendlen;
if (hs->hdrs[HDR_STRINGS_IDX_CONTENT_LEN_KEEPALIVE] == NULL) {
/* set up "content-length" and "connection:" headers */
get_http_content_length(hs);
}
/* How much data can we send? */
len = altcp_sndbuf(pcb);
sendlen = len;