summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php12
-rw-r--r--application/config/user_agents.php3
2 files changed, 8 insertions, 7 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index cced3ee02..124e4a436 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -73,7 +73,7 @@ return array(
'php3' => 'application/x-httpd-php',
'phtml' => 'application/x-httpd-php',
'phps' => 'application/x-httpd-php-source',
- 'js' => 'application/x-javascript',
+ 'js' => array('application/x-javascript', 'text/plain'),
'swf' => 'application/x-shockwave-flash',
'sit' => 'application/x-stuffit',
'tar' => 'application/x-tar',
@@ -104,16 +104,16 @@ return array(
'png' => array('image/png', 'image/x-png'),
'tiff' => 'image/tiff',
'tif' => 'image/tiff',
- 'css' => 'text/css',
- 'html' => 'text/html',
- 'htm' => 'text/html',
- 'shtml' => 'text/html',
+ 'css' => array('text/css', 'text/plain'),
+ 'html' => array('text/html', 'text/plain'),
+ 'htm' => array('text/html', 'text/plain'),
+ 'shtml' => array('text/html', 'text/plain'),
'txt' => 'text/plain',
'text' => 'text/plain',
'log' => array('text/plain', 'text/x-log'),
'rtx' => 'text/richtext',
'rtf' => 'text/rtf',
- 'xml' => array('application/xml', 'text/xml'),
+ 'xml' => array('application/xml', 'text/xml', 'text/plain'),
'xsl' => array('application/xml', 'text/xsl', 'text/xml'),
'mpeg' => 'video/mpeg',
'mpg' => 'video/mpeg',
diff --git a/application/config/user_agents.php b/application/config/user_agents.php
index 7f86d2dfc..35c36cb42 100644
--- a/application/config/user_agents.php
+++ b/application/config/user_agents.php
@@ -101,7 +101,8 @@ $browsers = array(
'Links' => 'Links',
'hotjava' => 'HotJava',
'amaya' => 'Amaya',
- 'IBrowse' => 'IBrowse'
+ 'IBrowse' => 'IBrowse',
+ 'Maxthon' => 'Maxthon'
);
$mobiles = array(