diff options
| author | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-02-22 21:49:33 +0100 |
|---|---|---|
| committer | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-02-22 21:49:33 +0100 |
| commit | 44a6d1da2be916fe0f23a3ea4d5fcb391d7f65dd (patch) | |
| tree | 31549ebf6ea5ea98e4347eb640d1caa685316f3e /application | |
| parent | 353f9834adf3f44c6c7a0f924089bb2b43360404 (diff) | |
| parent | eb291c1d1e1116a4420fa30e587adeea0451eeb7 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status
Diffstat (limited to 'application')
| -rw-r--r-- | application/config/config.php | 14 | ||||
| -rw-r--r-- | application/config/mimes.php | 9 |
2 files changed, 19 insertions, 4 deletions
diff --git a/application/config/config.php b/application/config/config.php index 415474e06..0608348c6 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -226,6 +226,20 @@ $config['log_path'] = ''; /* |-------------------------------------------------------------------------- +| Log File Extension +|-------------------------------------------------------------------------- +| +| The default filename extension for log files. The default 'php' allows for +| protecting the log files via basic scripting, when they are to be stored +| under a publicly accessible directory. +| +| Note: Leaving it blank will default to 'php'. +| +*/ +$config['log_file_extension'] = ''; + +/* +|-------------------------------------------------------------------------- | Date Format for Logs |-------------------------------------------------------------------------- | diff --git a/application/config/mimes.php b/application/config/mimes.php index 124e4a436..5b8ceff2e 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -44,13 +44,13 @@ return array( 'lzh' => 'application/octet-stream', 'exe' => array('application/octet-stream', 'application/x-msdownload'), 'class' => 'application/octet-stream', - 'psd' => 'application/x-photoshop', + 'psd' => array('application/x-photoshop', 'image/vnd.adobe.photoshop'), 'so' => 'application/octet-stream', 'sea' => 'application/octet-stream', 'dll' => 'application/octet-stream', 'oda' => 'application/oda', 'pdf' => array('application/pdf', 'application/x-download', 'binary/octet-stream'), - 'ai' => 'application/postscript', + 'ai' => array('application/pdf', 'application/postscript'), 'eps' => 'application/postscript', 'ps' => 'application/postscript', 'smi' => 'application/smil', @@ -123,7 +123,7 @@ return array( 'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'), 'movie' => 'video/x-sgi-movie', 'doc' => array('application/msword', 'application/vnd.ms-office'), - 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword'), + 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword', 'application/x-zip'), 'dot' => array('application/msword', 'application/vnd.ms-office'), 'dotx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip', 'application/msword'), 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip', 'application/vnd.ms-excel', 'application/msword'), @@ -154,12 +154,13 @@ return array( 'mp4' => 'video/mp4', 'm4a' => 'audio/x-m4a', 'f4v' => 'video/mp4', + 'webm' => 'video/webm', 'aac' => 'audio/x-acc', 'm4u' => 'application/vnd.mpegurl', 'm3u' => 'text/plain', 'xspf' => 'application/xspf+xml', 'vlc' => 'application/videolan', - 'wmv' => 'video/x-ms-wmv', + 'wmv' => array('video/x-ms-wmv', 'video/x-ms-asf'), 'au' => 'audio/x-au', 'ac3' => 'audio/ac3', 'flac' => 'audio/x-flac', |