Merge branch 'master' of git://git.zendframework.com/zf

Author: Shahar Evron

src/Header/ProxyAuthenticate.php

@@ -6,7 +6,7 @@
  * @throws Exception\InvalidArgumentException
  * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.33
  */
-class ProxyAuthenticate implements HeaderDescription
+class ProxyAuthenticate implements MultipleHeaderDescription
 {
 
     public static function fromString($headerLine)
@@ -41,4 +41,17 @@ public function toString()
         return 'Proxy-Authenticate: ' . $this->getFieldValue();
     }
 
+    public function toStringMultipleHeaders(array $headers)
+    {
+        $strings = array($this->toString());
+        foreach ($headers as $header) {
+            if (!$header instanceof ProxyAuthenticate) {
+                throw new Exception\RuntimeException(
+                    'The ProxyAuthenticate multiple header implementation can only accept an array of ProxyAuthenticate headers'
+                );
+            }
+            $strings[] = $header->toString();
+        }
+        return implode("\r\n", $strings);
+    }
 }

src/Header/WWWAuthenticate.php

@@ -6,7 +6,7 @@
  * @throws Exception\InvalidArgumentException
  * @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.47
  */
-class WWWAuthenticate implements HeaderDescription
+class WWWAuthenticate implements MultipleHeaderDescription
 {
 
     public static function fromString($headerLine)
@@ -41,4 +41,17 @@ public function toString()
         return 'WWW-Authenticate: ' . $this->getFieldValue();
     }
 
+    public function toStringMultipleHeaders(array $headers)
+    {
+        $strings = array($this->toString());
+        foreach ($headers as $header) {
+            if (!$header instanceof WWWAuthenticate) {
+                throw new Exception\RuntimeException(
+                    'The WWWAuthenticate multiple header implementation can only accept an array of WWWAuthenticate headers'
+                );
+            }
+            $strings[] = $header->toString();
+        }
+        return implode("\r\n", $strings);
+    }
 }