Merge branch 'Maks3w-hotfix/http-header-format'

Close #5302 Close #5253 Close #5290
zendframework · Oct 20, 2013 · 9aa8eb3 · 9aa8eb3
2 parents 335a3c8 + ae6c085
commit 9aa8eb3
Show file tree

Hide file tree

Showing 48 changed files with 129 additions and 46 deletions.
diff --git a/library/Zend/Http/Header/AbstractDate.php b/library/Zend/Http/Header/AbstractDate.php
@@ -74,7 +74,7 @@ public static function fromString($headerLine)
     {
         $dateHeader = new static();
 
-        list($name, $date) = explode(': ', $headerLine, 2);
+        list($name, $date) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== strtolower($dateHeader->getFieldName())) {

diff --git a/library/Zend/Http/Header/AbstractLocation.php b/library/Zend/Http/Header/AbstractLocation.php
@@ -47,7 +47,7 @@ public static function fromString($headerLine)
         $locationHeader = new static();
 
         // ZF-5520 - IIS bug, no space after colon
-        list($name, $uri) = explode(':', $headerLine, 2);
+        list($name, $uri) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== strtolower($locationHeader->getFieldName())) {

diff --git a/library/Zend/Http/Header/AcceptRanges.php b/library/Zend/Http/Header/AcceptRanges.php
@@ -23,7 +23,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'accept-ranges') {

diff --git a/library/Zend/Http/Header/Age.php b/library/Zend/Http/Header/Age.php
@@ -34,7 +34,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'age') {

diff --git a/library/Zend/Http/Header/Allow.php b/library/Zend/Http/Header/Allow.php
@@ -48,7 +48,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'allow') {

diff --git a/library/Zend/Http/Header/AuthenticationInfo.php b/library/Zend/Http/Header/AuthenticationInfo.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'authentication-info') {

diff --git a/library/Zend/Http/Header/Authorization.php b/library/Zend/Http/Header/Authorization.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'authorization') {

diff --git a/library/Zend/Http/Header/CacheControl.php b/library/Zend/Http/Header/CacheControl.php
@@ -34,7 +34,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'cache-control') {

diff --git a/library/Zend/Http/Header/Connection.php b/library/Zend/Http/Header/Connection.php
@@ -35,7 +35,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'connection') {

diff --git a/library/Zend/Http/Header/ContentDisposition.php b/library/Zend/Http/Header/ContentDisposition.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-disposition') {

diff --git a/library/Zend/Http/Header/ContentEncoding.php b/library/Zend/Http/Header/ContentEncoding.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-encoding') {

diff --git a/library/Zend/Http/Header/ContentLanguage.php b/library/Zend/Http/Header/ContentLanguage.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-language') {

diff --git a/library/Zend/Http/Header/ContentLength.php b/library/Zend/Http/Header/ContentLength.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-length') {

diff --git a/library/Zend/Http/Header/ContentMD5.php b/library/Zend/Http/Header/ContentMD5.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-md5') {

diff --git a/library/Zend/Http/Header/ContentRange.php b/library/Zend/Http/Header/ContentRange.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-range') {

diff --git a/library/Zend/Http/Header/ContentTransferEncoding.php b/library/Zend/Http/Header/ContentTransferEncoding.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-transfer-encoding') {

diff --git a/library/Zend/Http/Header/ContentType.php b/library/Zend/Http/Header/ContentType.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-type') {

diff --git a/library/Zend/Http/Header/Cookie.php b/library/Zend/Http/Header/Cookie.php
@@ -41,7 +41,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'cookie') {

diff --git a/library/Zend/Http/Header/Expect.php b/library/Zend/Http/Header/Expect.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'expect') {

diff --git a/library/Zend/Http/Header/From.php b/library/Zend/Http/Header/From.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'from') {

diff --git a/library/Zend/Http/Header/GenericHeader.php b/library/Zend/Http/Header/GenericHeader.php
@@ -34,11 +34,30 @@ class GenericHeader implements HeaderInterface
      */
     public static function fromString($headerLine)
     {
-        list($fieldName, $fieldValue) = explode(': ', $headerLine, 2);
+        list($fieldName, $fieldValue) = GenericHeader::splitHeaderLine($headerLine);
         $header = new static($fieldName, $fieldValue);
         return $header;
     }
 
+    /**
+     * Splits the header line in `name` and `value` parts.
+     *
+     * @param string $headerLine
+     * @return string[] `name` in the first index and `value` in the second.
+     * @throws Exception\InvalidArgumentException If header does not match with the format ``name:value``
+     */
+    public static function splitHeaderLine($headerLine)
+    {
+        $parts = explode(':', $headerLine, 2);
+        if (count($parts) !== 2) {
+            throw new Exception\InvalidArgumentException('Header must match with the format "name:value"');
+        }
+
+        $parts[1] = ltrim($parts[1]);
+
+        return $parts;
+    }
+
     /**
      * Constructor
      *

diff --git a/library/Zend/Http/Header/GenericMultiHeader.php b/library/Zend/Http/Header/GenericMultiHeader.php
@@ -13,7 +13,7 @@ class GenericMultiHeader extends GenericHeader implements MultipleHeaderInterfac
 {
     public static function fromString($headerLine)
     {
-        list($fieldName, $fieldValue) = explode(': ', $headerLine, 2);
+        list($fieldName, $fieldValue) = GenericHeader::splitHeaderLine($headerLine);
 
         if (strpos($fieldValue, ',')) {
             $headers = array();

diff --git a/library/Zend/Http/Header/HeaderInterface.php b/library/Zend/Http/Header/HeaderInterface.php
@@ -9,10 +9,41 @@
 
 namespace Zend\Http\Header;
 
+/**
+ * Interface for HTTP Header classes.
+ */
 interface HeaderInterface
 {
+    /**
+     * Factory to generate a header object from a string
+     *
+     * @param string $headerLine
+     * @return self
+     * @throws Exception\InvalidArgumentException If the header does not match RFC 2616 definition.
+     * @see http://tools.ietf.org/html/rfc2616#section-4.2
+     */
     public static function fromString($headerLine);
+
+    /**
+     * Retrieve header name
+     *
+     * @return string
+     */
     public function getFieldName();
+
+    /**
+     * Retrieve header value
+     *
+     * @return string
+     */
     public function getFieldValue();
+
+    /**
+     * Cast to string
+     *
+     * Returns in form of "NAME: VALUE"
+     *
+     * @return string
+     */
     public function toString();
 }
diff --git a/library/Zend/Http/Header/Host.php b/library/Zend/Http/Header/Host.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'host') {

diff --git a/library/Zend/Http/Header/IfMatch.php b/library/Zend/Http/Header/IfMatch.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'if-match') {

diff --git a/library/Zend/Http/Header/IfNoneMatch.php b/library/Zend/Http/Header/IfNoneMatch.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'if-none-match') {

diff --git a/library/Zend/Http/Header/IfRange.php b/library/Zend/Http/Header/IfRange.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'if-range') {

diff --git a/library/Zend/Http/Header/KeepAlive.php b/library/Zend/Http/Header/KeepAlive.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'keep-alive') {

diff --git a/library/Zend/Http/Header/MaxForwards.php b/library/Zend/Http/Header/MaxForwards.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'max-forwards') {

diff --git a/library/Zend/Http/Header/Pragma.php b/library/Zend/Http/Header/Pragma.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'pragma') {

diff --git a/library/Zend/Http/Header/ProxyAuthenticate.php b/library/Zend/Http/Header/ProxyAuthenticate.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'proxy-authenticate') {

diff --git a/library/Zend/Http/Header/ProxyAuthorization.php b/library/Zend/Http/Header/ProxyAuthorization.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'proxy-authorization') {

diff --git a/library/Zend/Http/Header/Range.php b/library/Zend/Http/Header/Range.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'range') {

diff --git a/library/Zend/Http/Header/Refresh.php b/library/Zend/Http/Header/Refresh.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'refresh') {

diff --git a/library/Zend/Http/Header/RetryAfter.php b/library/Zend/Http/Header/RetryAfter.php
@@ -35,7 +35,7 @@ public static function fromString($headerLine)
     {
         $dateHeader = new static();
 
-        list($name, $date) = explode(': ', $headerLine, 2);
+        list($name, $date) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== strtolower($dateHeader->getFieldName())) {

diff --git a/library/Zend/Http/Header/Server.php b/library/Zend/Http/Header/Server.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'server') {

diff --git a/library/Zend/Http/Header/SetCookie.php b/library/Zend/Http/Header/SetCookie.php
@@ -133,8 +133,7 @@ public static function fromString($headerLine, $bypassHeaderFieldName = false)
             };
         }
 
-        list($name, $value) = explode(':', $headerLine, 2);
-        $value = ltrim($value);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // some sites return set-cookie::value, this is to get rid of the second :
         $name = (strtolower($name) =='set-cookie:') ? 'set-cookie' : $name;

diff --git a/library/Zend/Http/Header/TE.php b/library/Zend/Http/Header/TE.php
@@ -20,7 +20,7 @@ public static function fromString($headerLine)
     {
         $header = new static();
 
-        list($name, $value) = explode(': ', $headerLine, 2);
+        list($name, $value) = GenericHeader::splitHeaderLine($headerLine);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'te') {