diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-27 13:08:38 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-01-27 13:08:38 +0100 |
| commit | f00191c02985fba1e360a22ad914c547696df1b2 (patch) | |
| tree | 76c2d963be0b7c70705369ca4a9f82946df8bba8 /application | |
| parent | 5dd84d04294b622f8b85f8aaac54d8329a2ae173 (diff) | |
| parent | 3bb336cf1c55584bb92ed32563a9543ec7f01574 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
Diffstat (limited to 'application')
| -rw-r--r-- | application/cache/.htaccess | 1 | ||||
| -rw-r--r-- | application/cache/index.html | 10 | ||||
| -rw-r--r-- | application/config/mimes.php | 2 | ||||
| -rw-r--r-- | application/logs/index.html | 10 |
4 files changed, 22 insertions, 1 deletions
diff --git a/application/cache/.htaccess b/application/cache/.htaccess new file mode 100644 index 000000000..3418e55a6 --- /dev/null +++ b/application/cache/.htaccess @@ -0,0 +1 @@ +deny from all
\ No newline at end of file diff --git a/application/cache/index.html b/application/cache/index.html new file mode 100644 index 000000000..c942a79ce --- /dev/null +++ b/application/cache/index.html @@ -0,0 +1,10 @@ +<html> +<head> + <title>403 Forbidden</title> +</head> +<body> + +<p>Directory access is forbidden.</p> + +</body> +</html>
\ No newline at end of file diff --git a/application/config/mimes.php b/application/config/mimes.php index 3815a5aa9..de923c45a 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -56,7 +56,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40', 'midi' => 'audio/midi', 'mpga' => 'audio/mpeg', 'mp2' => 'audio/mpeg', - 'mp3' => array('audio/mpeg', 'audio/mpg'), + 'mp3' => array('audio/mpeg', 'audio/mpg', 'audio/mpeg3'), 'aif' => 'audio/x-aiff', 'aiff' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff', diff --git a/application/logs/index.html b/application/logs/index.html new file mode 100644 index 000000000..c942a79ce --- /dev/null +++ b/application/logs/index.html @@ -0,0 +1,10 @@ +<html> +<head> + <title>403 Forbidden</title> +</head> +<body> + +<p>Directory access is forbidden.</p> + +</body> +</html>
\ No newline at end of file |