summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-24 14:14:21 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-24 14:14:21 +0200
commitc0f678dc369d5bc5302acc4f38809b0f1d0538fe (patch)
treedab1407ca55b0e8a8b32f41f6cdd6c410cc6857b
parent6df461a84a1915759111a1dce893c628bf805219 (diff)
Add zsh, 7zip, cdr, wma and jar to mimes.php (rel #1919, #1926)
-rw-r--r--application/config/mimes.php7
-rw-r--r--user_guide_src/source/changelog.rst6
2 files changed, 9 insertions, 4 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 90ffe61ff..ffbc2ee72 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -166,7 +166,12 @@ return array(
'ogg' => 'audio/ogg',
'kmz' => array('application/vnd.google-earth.kmz', 'application/zip', 'application/x-zip'),
'kml' => array('application/vnd.google-earth.kml+xml', 'application/xml', 'text/xml'),
- 'ics' => 'text/calendar'
+ 'ics' => 'text/calendar',
+ 'zsh' => 'text/x-scriptzsh',
+ '7zip' => array('application/x-compressed', 'application/x-zip-compressed', 'application/zip', 'multipart/x-zip'),
+ 'cdr' => array('application/cdr', 'application/coreldraw', 'application/x-cdr', 'application/x-coreldraw', 'image/cdr', 'image/x-cdr', 'zz-application/zz-winassoc-cdr'),
+ 'wma' => array('audio/x-ms-wma', 'video/x-ms-asf'),
+ 'jar' => array('application/java-archive', 'application/x-java-application', 'application/x-jar', 'application/x-compressed')
);
/* End of file mimes.php */
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4048395a8..9aa4f5f6e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -26,12 +26,12 @@ Release Date: Not Released
- Added Fennec (Firefox for mobile) to the list of mobile user agents.
- Ability to log certain error types, not all under a threshold.
- Added support for pem, p10, p12, p7a, p7c, p7m, p7r, p7s, crt, crl, der, kdb, rsa, cer, sst, csr Certs to mimes.php.
- - Added support for pgp and gpg to mimes.php.
+ - Added support for pgp, gpg, zsh and cdr files to mimes.php.
- Added support for 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
- - Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
+ - Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg, wma Audio files to mimes.php.
- Added support for kmz and kml (Google Earth) files to mimes.php.
- Added support for ics Calendar files to mimes.php.
- - Added support for rar archives to mimes.php.
+ - Added support for rar, jar and 7zip archives to mimes.php.
- Updated support for xml ('application/xml') and xsl ('application/xml', 'text/xsl') files in mimes.php.
- Updated support for doc files in mimes.php.
- Updated support for docx files in mimes.php.