merged branch romainneutron/file-binary-guesser (PR #7006)

fabpot · fabpot · commit 7a35cb7c3b06 · 2013-02-07T17:36:12.000+01:00
This PR was merged into the 2.0 branch. Commits ------- a12744e Add dot character `.` to legal mime subtype regular expression Discussion ---------- [HttpFoundation][2.0] Add dot character `.` to legal mime subtype regular expression | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT For example, the following mimetype (used for Microsoft powerpoints) is not recognized given the current regexp : `application/vnd.ms-powerpoint; charset=binary`
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
@@ -62,7 +62,7 @@ public function guess($path)
 
         $type = trim(ob_get_clean());
 
-        if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-]+)#i', $type, $match)) {
+        if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {
             // it's not a type, but an error message
             return null;
         }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function guess($path)`
`62`	`62`
`63`	`63`	`$type = trim(ob_get_clean());`
`64`	`64`
`65`		`- if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-]+)#i', $type, $match)) {`
	`65`	`+ if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {`
`66`	`66`	`// it's not a type, but an error message`
`67`	`67`	`return null;`
`68`	`68`	`}`