Merge remote-tracking branch 'upstream/master'

teynon · teynon · commit 34cfe0c4989b · 2013-04-24T15:37:12.000-04:00
diff --git a/server/php/files/.htaccess b/server/php/files/.htaccess
@@ -7,6 +7,9 @@ ForceType application/octet-stream
   ForceType none
 </FilesMatch>
 
+# Prevent IE from MIME-sniffing:
+Header set X-Content-Type-Options "nosniff"
+
 # Uncomment the following lines to prevent unauthorized download of files:
 #AuthName "Authorization required"
 #AuthType Basic
