Merge branch 'hotfix/3699'

Close zendframework/zendframework#3699
zendframework · Feb 8, 2013 · a65cb66 · a65cb66
commit a65cb66
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/Header/SetCookie.php b/src/Header/SetCookie.php
@@ -132,7 +132,8 @@ public static function fromString($headerLine, $bypassHeaderFieldName = false)
             };
         }
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = explode(':', $headerLine, 2);
+        $value = ltrim($value);
 
         // some sites return set-cookie::value, this is to get rid of the second :
         $name = (strtolower($name) =='set-cookie:') ? 'set-cookie' : $name;
@@ -227,7 +228,7 @@ public function getFieldName()
     public function getFieldValue()
     {
         if ($this->getName() == '') {
-            throw new Exception\RuntimeException('A cookie name is required to generate a field value for this cookie');
+            return '';
         }
 
         $value = $this->getValue();

diff --git a/test/Header/SetCookieTest.php b/test/Header/SetCookieTest.php
@@ -334,7 +334,16 @@ public static function validCookieWithInfoProvider()
                 ),
                 'myname=myvalue; Expires=Wed, 13-Jan-2021 22:23:01 GMT; Domain=docs.foo.com; Path=/accounts; Secure; HttpOnly'
             ),
+            array(
+                'Set-Cookie:',
+                array(),
+                ''
+            ),
+            array(
+                'Set-Cookie: ',
+                array(),
+                ''
+            ),
         );
     }
-
 }