bug #33965 [HttpFoundation] Add plus character + to legal mime subtype (ilzrv)

nicolas-grekas · nicolas-grekas · commit a8a4aadf244c · 2019-10-12T10:56:52.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpFoundation] Add plus character `+` to legal mime subtype | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - For example, the following mime type (used for epub) is not recognized given the current regexp: `application/epub+zip; charset=binary` Commits ------- 56895f1 Add plus character `+` to legal mime subtype
diff --git a/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php b/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php
@@ -89,7 +89,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
`@@ -89,7 +89,7 @@ public function guess($path)`
`89`	`89`
`90`	`90`	`$type = trim(ob_get_clean());`
`91`	`91`
`92`		`- if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\.]+)#i', $type, $match)) {`
	`92`	`+ if (!preg_match('#^([a-z0-9\-]+/[a-z0-9\-\+\.]+)#i', $type, $match)) {`
`93`	`93`	`// it's not a type, but an error message`
`94`	`94`	`return null;`
`95`	`95`	`}`