Forward port #2929

zendframework · Nov 14, 2012 · 91e7eca · 91e7eca
2 parents 6d8a006 + 9fffcff
commit 91e7eca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Zend/Http/Header/SetCookie.php b/library/Zend/Http/Header/SetCookie.php
@@ -109,7 +109,7 @@ public static function fromString($headerLine, $bypassHeaderFieldName = false)
                     // First K=V pair is always the cookie name and value
                     if ($header->getName() === NULL) {
                         $header->setName($headerKey);
-                        $header->setValue($headerValue);
+                        $header->setValue(urldecode($headerValue));
                         continue;
                     }
 

diff --git a/tests/ZendTest/Http/Header/SetCookieTest.php b/tests/ZendTest/Http/Header/SetCookieTest.php
@@ -319,7 +319,7 @@ public static function validCookieWithInfoProvider()
                     'secure'  => true,
                     'httponly'=> false
                 ),
-                'PHPSESSID=123456789%2Babcd%252Cef; Expires=Tue, 21-Nov-2006 08:33:44 GMT; Domain=.localdomain; Path=/foo/baz; Secure'
+                'PHPSESSID=123456789+abcd%2Cef; Expires=Tue, 21-Nov-2006 08:33:44 GMT; Domain=.localdomain; Path=/foo/baz; Secure'
             ),
             array(
                 'Set-Cookie: myname=myvalue; Domain=docs.foo.com; Path=/accounts; Expires=Wed, 13-Jan-2021 22:23:01 GMT; Secure; HttpOnly',