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

Fix detecting text/x-php mimetype and secure mimetype mapping
nextcloud · Sep 8, 2020 · 919a8d4 · 919a8d4
2 parents b4729ce + 16b9817
commit 919a8d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
@@ -122,8 +122,14 @@ public function registerTypeArray(array $types): void {
 		$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];
+			}
 		}
 	}
 

diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
@@ -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"],