diff options
| author | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-10-06 08:43:29 -0700 |
| commit | 6b40c2cd090d1c406b3e1cd7ad135baff21bfd54 (patch) | |
| tree | a9d5b42f896384b129b8edfe5b9e8ec2b21ca21d /library/blueimp_upload/server/php/files | |
| parent | 79bb60aafd39fef7bc4d03eb40d33e23af5b793f (diff) | |
| parent | 34ef3fda76a924d09e77a698e38b79922b8b7f88 (diff) | |
| download | volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.gz volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.bz2 volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'library/blueimp_upload/server/php/files')
| -rw-r--r-- | library/blueimp_upload/server/php/files/.gitignore | 3 | ||||
| -rw-r--r-- | library/blueimp_upload/server/php/files/.htaccess | 18 |
2 files changed, 21 insertions, 0 deletions
diff --git a/library/blueimp_upload/server/php/files/.gitignore b/library/blueimp_upload/server/php/files/.gitignore new file mode 100644 index 000000000..e24a60fae --- /dev/null +++ b/library/blueimp_upload/server/php/files/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!.htaccess diff --git a/library/blueimp_upload/server/php/files/.htaccess b/library/blueimp_upload/server/php/files/.htaccess new file mode 100644 index 000000000..56689f0bb --- /dev/null +++ b/library/blueimp_upload/server/php/files/.htaccess @@ -0,0 +1,18 @@ +# The following directives force the content-type application/octet-stream +# and force browsers to display a download dialog for non-image files. +# This prevents the execution of script files in the context of the website: +ForceType application/octet-stream +Header set Content-Disposition attachment +<FilesMatch "(?i)\.(gif|jpe?g|png)$"> + ForceType none + Header unset Content-Disposition +</FilesMatch> + +# The following directive prevents browsers from MIME-sniffing the content-type. +# This is an important complement to the ForceType directive above: +Header set X-Content-Type-Options nosniff + +# Uncomment the following lines to prevent unauthorized download of files: +#AuthName "Authorization required" +#AuthType Basic +#require valid-user |