parse cookie values containing the equal sign

xabbuh · xabbuh · commit 277e37e63f9e · 2021-01-02T13:40:41.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -62,7 +62,15 @@ public static function fromString($cookie, $decode = false)
         $part = array_shift($parts);
 
         $name = $decode ? urldecode($part[0]) : $part[0];
-        $value = isset($part[1]) ? ($decode ? urldecode($part[1]) : $part[1]) : null;
+        $value = null;
+
+        if (isset($part[1])) {
+            $value = implode('=', array_slice($part, 1));
+
+            if ($decode) {
+                $value = urldecode($value);
+            }
+        }
 
         $data = HeaderUtils::combine($parts) + $data;
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php
@@ -227,6 +227,9 @@ public function testFromString()
 
         $cookie = Cookie::fromString('foo', true);
         $this->assertEquals(Cookie::create('foo', null, 0, '/', null, false, false, false, null), $cookie);
+
+        $cookie = Cookie::fromString('foo_cookie=foo=1&bar=2&baz=3; expires=Tue, 22-Sep-2020 06:27:09 GMT; path=/');
+        $this->assertEquals(Cookie::create('foo_cookie', 'foo=1&bar=2&baz=3', strtotime('Tue, 22-Sep-2020 06:27:09 GMT'), '/', null, false, false, true, null), $cookie);
     }
 
     public function testFromStringWithHttpOnly()

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,9 @@ public function testFromString()`
`227`	`227`
`228`	`228`	`$cookie = Cookie::fromString('foo', true);`
`229`	`229`	`$this->assertEquals(Cookie::create('foo', null, 0, '/', null, false, false, false, null), $cookie);`
	`230`	`+`
	`231`	`+ $cookie = Cookie::fromString('foo_cookie=foo=1&bar=2&baz=3; expires=Tue, 22-Sep-2020 06:27:09 GMT; path=/');`
	`232`	`+ $this->assertEquals(Cookie::create('foo_cookie', 'foo=1&bar=2&baz=3', strtotime('Tue, 22-Sep-2020 06:27:09 GMT'), '/', null, false, false, true, null), $cookie);`
`230`	`233`	`}`
`231`	`234`
`232`	`235`	`public function testFromStringWithHttpOnly()`