stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

send content-type when LWS_WITH_RANGES=OFF

Browse source 
https://github.com/warmcat/libwebsockets/pull/987

With the RANGES feature disabled, lws_serve_http_file would
not add the content-type header to the response.
This commit is contained in:
lnmx 2017-08-12 20:47:23 +08:00 • committed by Andy Green
parent 5a38d88fdd
commit b93c057472
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/server.c
View file

@ -2619,13 +2619,17 @@ lws_serve_http_file(struct lws *wsi, const char *file, const char *content_type,
lwsl_info("file is being provided in gzip\n");
}
if (
#if defined(LWS_WITH_RANGES)
if (ranges < 2 && content_type && content_type[0])
ranges < 2 &&
#endif
content_type && content_type[0])
if (lws_add_http_header_by_token(wsi, WSI_TOKEN_HTTP_CONTENT_TYPE,
(unsigned char *)content_type,
strlen(content_type), &p, end))
return -1;
#if defined(LWS_WITH_RANGES)
if (ranges >= 2) { /* multipart byteranges */
strncpy(wsi->u.http.multipart_content_type, content_type,
sizeof(wsi->u.http.multipart_content_type) - 1);