ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-18 20:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set Content-Type in static file HTTP responses

Browse Source 
The static file server now sets the Content-Type of the response
depending on the file name extension:

    .txt        =  text/plain; charset=utf-8
    .htm .html  =  text/html; charset=utf-8
    .json       =  application/json
    .rfm        =  rhizome/manifest; format=text+binarysig
This commit is contained in:
Andrew Bettison 2017-10-20 10:01:15 +10:30
parent 29ce8994f2
commit 9e32c01e61
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server_httpd.c
View File

@ -162,7 +162,22 @@ static int static_page(httpd_request *r, const char *remainder)
r->finalise_union=finalise_union_close_file;
// TODO find extension and set content type properly
// Set Content-Type header based on the extension of the file name. All text and html is assumed
// to be in UTF-8 encoding.
const struct mime_content_type *content_type = &CONTENT_TYPE_BLOB;
if (strcase_endswith(path, ".txt", NULL)) {
content_type = &CONTENT_TYPE_TEXT;
}
else if (strcase_endswith(path, ".htm", NULL) || strcase_endswith(path, ".html", NULL)) {
content_type = &CONTENT_TYPE_HTML;
}
else if (strcase_endswith(path, ".json", NULL)) {
content_type = &CONTENT_TYPE_JSON;
}
else if (strcase_endswith(path, ".rhm", NULL)) {
content_type = &CONTENT_TYPE_RHIZOME_MANIFEST;
}
http_response_init_content_range(r, stat.st_size);
if (r->http.response.header.content_range_start){
if (lseek64(r->u.file.fd, r->http.response.header.content_range_start, SEEK_SET)){
@ -171,6 +186,6 @@ static int static_page(httpd_request *r, const char *remainder)
}
}
r->u.file.offset=r->http.response.header.content_range_start;
http_request_response_generated(&r->http, 200, &CONTENT_TYPE_HTML, static_file_generator);
http_request_response_generated(&r->http, 200, content_type, static_file_generator);
return 1;
}