Skip to content

Commit

Permalink
Adding new MIME types, a note about 404, and a PHP flag
Browse files Browse the repository at this point in the history
Fixes #1062 and #1053
  • Loading branch information
mikealmond committed Apr 24, 2012
1 parent a95f300 commit e49353b
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions .htaccess
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -96,12 +96,13 @@ AddType application/javascript js


# Audio # Audio
AddType audio/ogg oga ogg AddType audio/ogg oga ogg
AddType audio/mp4 m4a AddType audio/mp4 m4a f4a f4b


# Video # Video
AddType video/ogg ogv AddType video/ogg ogv
AddType video/mp4 mp4 m4v AddType video/mp4 mp4 m4v f4v f4p
AddType video/webm webm AddType video/webm webm
AddType video/x-flv flv


# SVG # SVG
# Required for svg webfonts on iPad # Required for svg webfonts on iPad
Expand All @@ -127,6 +128,8 @@ AddType application/x-xpinstall xpi
AddType application/octet-stream safariextz AddType application/octet-stream safariextz
AddType application/x-web-app-manifest+json webapp AddType application/x-web-app-manifest+json webapp
AddType text/x-vcard vcf AddType text/x-vcard vcf
AddType application/json json
AddType application/x-shockwave-flash swf






Expand Down Expand Up @@ -423,6 +426,8 @@ Options -MultiViews
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------


# You can add custom pages to handle 500 or 403 pretty easily, if you like. # 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 ErrorDocument 404 /404.html




Expand Down Expand Up @@ -497,6 +502,9 @@ AddCharset utf-8 .css .js .xml .json .rss .atom
# Rename session cookie to something else, than PHPSESSID # Rename session cookie to something else, than PHPSESSID
# php_value session.name sid # 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 # Do not show you are using PHP
# Note: Move this line to php.ini since it won't work in .htaccess # Note: Move this line to php.ini since it won't work in .htaccess
# php_flag expose_php Off # php_flag expose_php Off
Expand Down

0 comments on commit e49353b

Please sign in to comment.