Permalink
Browse files

Adding new MIME types, a note about 404, and a PHP flag

Fixes #1062 and #1053
  • Loading branch information...
mikealmond committed Apr 24, 2012
1 parent a95f300 commit e49353b05f13f103dd9d267a1278f688ed451dc2
Showing with 10 additions and 2 deletions.
  1. +10 −2 .htaccess
View
@@ -96,12 +96,13 @@ AddType application/javascript js
# Audio
AddType audio/ogg oga ogg
-AddType audio/mp4 m4a
+AddType audio/mp4 m4a f4a f4b
# Video
AddType video/ogg ogv
-AddType video/mp4 mp4 m4v
+AddType video/mp4 mp4 m4v f4v f4p
AddType video/webm webm
+AddType video/x-flv flv
# SVG
# Required for svg webfonts on iPad
@@ -127,6 +128,8 @@ AddType application/x-xpinstall xpi
AddType application/octet-stream safariextz
AddType application/x-web-app-manifest+json webapp
AddType text/x-vcard vcf
+AddType application/json json
+AddType application/x-shockwave-flash swf
@@ -423,6 +426,8 @@ Options -MultiViews
# ----------------------------------------------------------------------
# You can add custom pages to handle 500 or 403 pretty easily, if you like.
+# If you are hosting your site in subdirectory, adjust this accordingly
+# e.g. ErrorDocument 404 /subdir/404.html
ErrorDocument 404 /404.html
@@ -497,6 +502,9 @@ AddCharset utf-8 .css .js .xml .json .rss .atom
# Rename session cookie to something else, than PHPSESSID
# php_value session.name sid
+# Disable magic quotes (This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.)
+# php_flag magic_quotes_gpc Off
+
# Do not show you are using PHP
# Note: Move this line to php.ini since it won't work in .htaccess
# php_flag expose_php Off

0 comments on commit e49353b

Please sign in to comment.