Correctly remove the charset from finfo mimetype

diff --git a/lib/private/Files/Type/Detection.php b/lib/private/Files/Type/Detection.php
index 492025b7bfc30f2268a723e0db0ec8a1338b175e..66ef0dd2aabfab71fbe44c6e7d2a1d367fd50392 100644 (file)
--- a/lib/private/Files/Type/Detection.php
+++ b/lib/private/Files/Type/Detection.php
@@ -200,7 +200,7 @@ class Detection implements IMimeTypeDetector {
                        $info = @strtolower(finfo_file($finfo, $path));
                        finfo_close($finfo);
                        if ($info) {
-                               $mimeType = substr($info, 0, strpos($info, ';'));
+                               $mimeType = strpos($info, ';') !== false ? substr($info, 0, strpos($info, ';')) : $info;
                                return empty($mimeType) ? 'application/octet-stream' : $mimeType;
                        }
 
@@ -238,7 +238,8 @@ class Detection implements IMimeTypeDetector {
        public function detectString($data) {
                if (function_exists('finfo_open') and function_exists('finfo_file')) {
                        $finfo = finfo_open(FILEINFO_MIME);
-                       return finfo_buffer($finfo, $data);
+                       $info = finfo_buffer($finfo, $data);
+                       return strpos($info, ';') !== false ? substr($info, 0, strpos($info, ';')) : $info;
                } else {
                        $tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
                        $fh = fopen($tmpFile, 'wb');

diff --git a/tests/lib/Files/Type/DetectionTest.php b/tests/lib/Files/Type/DetectionTest.php
index 7b9dc1b3e4d47e6b7aff89ef39ec3903cb886b4b..11267ee2e7dfcef721575f3df6686ff89d0a535f 100644 (file)
--- a/tests/lib/Files/Type/DetectionTest.php
+++ b/tests/lib/Files/Type/DetectionTest.php
@@ -81,7 +81,7 @@ class DetectionTest extends \Test\TestCase {
 
        public function testDetectString() {
                $result = $this->detection->detectString("/data/data.tar.gz");
-               $expected = 'text/plain; charset=us-ascii';
+               $expected = 'text/plain';
                $this->assertEquals($expected, $result);
        }