bug #37581 [Mime] Fix compat with HTTP requests (fabpot)

fabpot · fabpot · commit f617380af53f · 2020-07-15T14:00:31.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Mime] Fix compat with HTTP requests | Q | A | ------------- | --- | Branch? | 4.4  | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | Fix #37500, Fix #36738, Fix #35443 | License | MIT | Doc PR | n/a Commits ------- 52e7d7c [Mime] Fix compat with HTTP requests
diff --git a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php
@@ -158,7 +158,8 @@ private function createParameter(string $name, string $value): string
      */
     private function getEndOfParameterValue(string $value, bool $encoded = false, bool $firstLine = false): string
     {
-        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
+        $forceHttpQuoting = 'content-disposition' === strtolower($this->getName()) && 'form-data' === $this->getValue();
+        if ($forceHttpQuoting || !preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
             $value = '"'.$value.'"';
         }
         $prepend = '=';
diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Component/Mime/Part/TextPart.php
@@ -129,7 +129,7 @@ public function getPreparedHeaders(): Headers
         if ($this->charset) {
             $headers->setHeaderParameter('Content-Type', 'charset', $this->charset);
         }
-        if ($this->name) {
+        if ($this->name && 'form-data' !== $this->disposition) {
             $headers->setHeaderParameter('Content-Type', 'name', $this->name);
         }
         $headers->setHeaderBody('Text', 'Content-Transfer-Encoding', $this->encoding);

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,8 @@ private function createParameter(string $name, string $value): string`
`158`	`158`	`*/`
`159`	`159`	`private function getEndOfParameterValue(string $value, bool $encoded = false, bool $firstLine = false): string`
`160`	`160`	`{`
`161`		`- if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {`
	`161`	`+ $forceHttpQuoting = 'content-disposition' === strtolower($this->getName()) && 'form-data' === $this->getValue();`
	`162`	`+ if ($forceHttpQuoting \|\| !preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {`
`162`	`163`	`$value = '"'.$value.'"';`
`163`	`164`	`}`
`164`	`165`	`$prepend = '=';`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public function getPreparedHeaders(): Headers`
`129`	`129`	`if ($this->charset) {`
`130`	`130`	`$headers->setHeaderParameter('Content-Type', 'charset', $this->charset);`
`131`	`131`	`}`
`132`		`- if ($this->name) {`
	`132`	`+ if ($this->name && 'form-data' !== $this->disposition) {`
`133`	`133`	`$headers->setHeaderParameter('Content-Type', 'name', $this->name);`
`134`	`134`	`}`
`135`	`135`	`$headers->setHeaderBody('Text', 'Content-Transfer-Encoding', $this->encoding);`