symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Cookie.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Cookie.php
+15-2Lines changed: 15 additions & 2 deletions b/‎src/Symfony/Component/HttpFoundation/Cookie.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Cookie.php
+15-2Lines changed: 15 additions & 2 deletions
@@ -29,6 +29,8 @@ class Cookie
     private $sameSite;
     private $secureDefault = false;
 
+    private static $charNameReserved = "=,; \t\r\n\013\014";
+
     const SAMESITE_NONE = 'none';
     const SAMESITE_LAX = 'lax';
     const SAMESITE_STRICT = 'strict';
@@ -93,7 +95,7 @@ public function __construct(string $name, string $value = null, $expire = 0, ?st
         }
 
         // from PHP source code
-        if ($raw && preg_match("/[=,; \t\r\n\013\014]/", $name)) {
+        if ($raw && preg_match('/['.self::$charNameReserved.']/', $name)) {
             throw new \InvalidArgumentException(sprintf('The cookie name "%s" contains invalid characters.', $name));
         }
 
@@ -141,7 +143,13 @@ public function __construct(string $name, string $value = null, $expire = 0, ?st
      */
     public function __toString()
     {
-        $str = ($this->isRaw() ? $this->getName() : urlencode($this->getName())).'=';
+        if ($this->isRaw()) {
+            $str = $this->getName();
+        } else {
+            $str = preg_replace_callback('/['.self::$charNameReserved.']/', [$this, 'rawurlencodeMatchZero'], $this->getName());
+        }
+
+        $str .= '=';
 
         if ('' === (string) $this->getValue()) {
             $str .= 'deleted; expires='.gmdate('D, d-M-Y H:i:s T', time() - 31536001).'; Max-Age=0';
@@ -176,6 +184,11 @@ public function __toString()
         return $str;
     }
 
+    private function rawurlencodeMatchZero(array $match)
+    {
+        return rawurlencode($match[0]);
+    }
+
     /**
      * Gets the name of the cookie.
      *