smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Registered MIME-types for .ico and .json 

As a result, favicon.ico stopped being considered a compressible resource.
This commit is contained in:
Veloman Yunkan 2023-02-09 22:18:36 +01:00
parent f4f7879ff3
commit e8c8a297b5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/pathTools.cpp
View File

@ -493,12 +493,14 @@ static std::map<std::string, std::string> extMimeTypes = {
{ "jpeg", "image/jpeg"}, { "jpeg", "image/jpeg"},
{ "jpg", "image/jpeg"}, { "jpg", "image/jpeg"},
{ "gif", "image/gif"}, { "gif", "image/gif"},
{ "ico", "image/x-icon"},
{ "svg", "image/svg+xml"}, { "svg", "image/svg+xml"},
{ "txt", "text/plain"}, { "txt", "text/plain"},
{ "xml", "text/xml"}, { "xml", "text/xml"},
{ "pdf", "application/pdf"}, { "pdf", "application/pdf"},
{ "ogg", "application/ogg"}, { "ogg", "application/ogg"},
{ "js", "application/javascript"}, { "js", "application/javascript"},
{ "json", "application/json"},
{ "css", "text/css"}, { "css", "text/css"},
{ "otf", "application/vnd.ms-opentype"}, { "otf", "application/vnd.ms-opentype"},
{ "ttf", "application/font-ttf"}, { "ttf", "application/font-ttf"},

8
test/server.cpp
View File

@ -58,8 +58,6 @@ const ResourceCollection resources200Compressible{
{ STATIC_CONTENT, "/ROOT%23%3F/skin/autoComplete.min.js?cacheid=1191aaaf" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/autoComplete.min.js?cacheid=1191aaaf" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/css/autoComplete.css" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/css/autoComplete.css" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/css/autoComplete.css?cacheid=08951e06" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/css/autoComplete.css?cacheid=08951e06" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon.ico" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon.ico?cacheid=fba03a27" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/i18n.js" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/i18n.js" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/i18n.js?cacheid=6da2bca0" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/i18n.js?cacheid=6da2bca0" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/index.css" },
@ -119,6 +117,8 @@ const ResourceCollection resources200Uncompressible{
{ STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon-16x16.png?cacheid=a986fedc" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon-16x16.png?cacheid=a986fedc" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon-32x32.png" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon-32x32.png" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon-32x32.png?cacheid=79ded625" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon-32x32.png?cacheid=79ded625" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon.ico" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/favicon.ico?cacheid=fba03a27" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/favicon/mstile-144x144.png" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/favicon/mstile-144x144.png" },
{ STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/mstile-144x144.png?cacheid=c25a7641" }, { STATIC_CONTENT, "/ROOT%23%3F/skin/favicon/mstile-144x144.png?cacheid=c25a7641" },
{ DYNAMIC_CONTENT, "/ROOT%23%3F/skin/favicon/mstile-150x150.png" }, { DYNAMIC_CONTENT, "/ROOT%23%3F/skin/favicon/mstile-150x150.png" },
@ -487,8 +487,8 @@ TEST_F(ServerTest, MimeTypes)
{ "/catalog/v2/root.xml", "application/atom+xml;profile=opds-catalog;kind=navigation" }, { "/catalog/v2/root.xml", "application/atom+xml;profile=opds-catalog;kind=navigation" },
{ "/skin/search-icon.svg", "image/svg+xml" }, { "/skin/search-icon.svg", "image/svg+xml" },
{ "/skin/bittorrent.png", "image/png" }, { "/skin/bittorrent.png", "image/png" },
{ "/skin/favicon/favicon.ico", "text/plain" }, // !!! { "/skin/favicon/favicon.ico", "image/x-icon" },
{ "/skin/i18n/en.json", "text/plain" }, // !!! { "/skin/i18n/en.json", "application/json" },
{ "/skin/fonts/Roboto.ttf", "application/font-ttf" }, { "/skin/fonts/Roboto.ttf", "application/font-ttf" },
{ "/suggest?content=zimfile&term=ray", "application/json; charset=utf-8" }, { "/suggest?content=zimfile&term=ray", "application/json; charset=utf-8" },
}; };