From 6c70e847dd1a53f6d27bc485c1fb346f99c537d2 Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk <victor.dubiniuk@gmail.com> Date: Fri, 4 Mar 2016 22:09:52 +0300 Subject: [PATCH] Add bzip2 to known mimetypes --- resources/config/mimetypealiases.dist.json | 1 + resources/config/mimetypemapping.dist.json | 3 +++ version.php | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json index 2c508ec4fab..2a1e8485780 100644 --- a/resources/config/mimetypealiases.dist.json +++ b/resources/config/mimetypealiases.dist.json @@ -56,6 +56,7 @@ "application/vnd.visio": "x-office/document", "application/vnd.wordperfect": "x-office/document", "application/x-7z-compressed": "package/x-generic", + "application/x-bzip2": "package/x-generic", "application/x-cbr": "text", "application/x-compressed": "package/x-generic", "application/x-dcraw": "image", diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json index 3498172f1d3..16f5027d626 100644 --- a/resources/config/mimetypemapping.dist.json +++ b/resources/config/mimetypemapping.dist.json @@ -19,6 +19,7 @@ "bin": ["application/x-bin"], "bmp": ["image/bmp"], "bpg": ["image/bpg"], + "bz2": ["application/x-bzip2"], "cb7": ["application/x-cbr"], "cba": ["application/x-cbr"], "cbr": ["application/x-cbr"], @@ -148,7 +149,9 @@ "svg": ["image/svg+xml", "text/plain"], "swf": ["application/x-shockwave-flash", "application/octet-stream"], "tar": ["application/x-tar"], + "tar.bz2": ["application/x-bzip2"], "tar.gz": ["application/x-compressed"], + "tbz2": ["application/x-bzip2"], "tex": ["application/x-tex"], "tgz": ["application/x-compressed"], "tiff": ["image/tiff"], diff --git a/version.php b/version.php index 708f02ba4b0..ffbafb72fe6 100644 --- a/version.php +++ b/version.php @@ -25,7 +25,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(9, 1, 0, 5); +$OC_Version = array(9, 1, 0, 6); // The human readable string $OC_VersionString = '9.1.0 beta 1'; -- GitLab