sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22646 from nextcloud/bugfix/mimetype-mapping 

Fix detecting text/x-php mimetype and secure mimetype mapping
pull/22727/head
Roeland Jago Douma 2020-09-08 10:41:09 +07:00 committed by GitHub
parent b4729ce142 16b9817358
commit 919a8d473b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/Files/Type/Detection.php
Unescape Escape View File

@ -122,8 +122,14 @@ class Detection implements IMimeTypeDetector {
$this->mimetypes = array_merge($this->mimetypes, $types);
// Update the alternative mimetypes to avoid having to look them up each time.
foreach ($this->mimetypes as $mimeType) {
foreach ($this->mimetypes as $extension => $mimeType) {
if (strpos($extension, '_comment') === 0) {
continue;
}
$this->secureMimeTypes[$mimeType[0]] = $mimeType[1] ?? $mimeType[0];
if (isset($mimeType[1])) {
$this->secureMimeTypes[$mimeType[1]] = $mimeType[1];
}
}
}

2
resources/config/mimetypemapping.dist.json
Unescape Escape View File

@ -134,7 +134,7 @@
"pdf": ["application/pdf"],
"pfb": ["application/x-font"],
"pef": ["image/x-dcraw"],
"php": ["application/x-php"],
"php": ["application/x-php", "text/x-php"],
"pl": ["application/x-perl"],
"pls": ["audio/x-scpls"],
"png": ["image/png"],