From 52e7d7cf17203c5f399122e4868cd152844a0aa2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 15 Jul 2020 08:42:27 +0200 Subject: [PATCH] [Mime] Fix compat with HTTP requests --- src/Symfony/Component/Mime/Header/ParameterizedHeader.php | 3 ++- src/Symfony/Component/Mime/Part/TextPart.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php index d8e50011fa2ac..9d3b905a28c16 100644 --- 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 index a41d91ddec86e..35224ad9d8cd0 100644 --- 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); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy