diff options
| author | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-09 17:26:28 +0100 |
|---|---|---|
| committer | Gerrit Uitslag <klapinklapin@gmail.com> | 2014-12-09 17:26:28 +0100 |
| commit | 8702de7f7e170bddfdb622c393c3cac3446fd1c5 (patch) | |
| tree | c7269ea61f5d4230a6f916dbabee4ce412e0a9fb /conf | |
| parent | 1cc82e5c76ae7fcd646e448404afdc0fd458bf55 (diff) | |
| parent | 9a0ca2cfd8ac42895af3be2efbd2cab7e6d33578 (diff) | |
| download | rpg-8702de7f7e170bddfdb622c393c3cac3446fd1c5.tar.gz rpg-8702de7f7e170bddfdb622c393c3cac3446fd1c5.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into scrutinizerissues
Conflicts:
inc/media.php
inc/plugin.php
inc/template.php
lib/plugins/authplain/_test/escaping.test.php
lib/plugins/syntax.php
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mime.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/conf/mime.conf b/conf/mime.conf index 2a50fab10..c2e03b775 100644 --- a/conf/mime.conf +++ b/conf/mime.conf @@ -9,7 +9,6 @@ gif image/gif png image/png ico image/vnd.microsoft.icon -swf application/x-shockwave-flash mp3 audio/mpeg ogg audio/ogg wav audio/wav @@ -66,3 +65,7 @@ odt !application/vnd.oasis.opendocument.text #xml text/xml #csv text/csv +# Also flash may be able to execute arbitrary scripts in the website's +# context +#swf application/x-shockwave-flash + |