Merge branch 'master' into ValidatorMessages

zendframework · Nov 4, 2013 · a05e97f · a05e97f
commit a05e97f
Show file tree

Hide file tree

Showing 143 changed files with 753 additions and 283 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -205,6 +205,10 @@ public function setAdapter($adapter)
      */
     public function getAdapter()
     {
+        if (! $this->adapter) {
+            $this->setAdapter($this->config['adapter']);
+        }
+
         return $this->adapter;
     }
 
@@ -812,10 +816,7 @@ public function send(Request $request = null)
         $this->redirectCounter = 0;
         $response = null;
 
-        // Make sure the adapter is loaded
-        if ($this->adapter == null) {
-            $this->setAdapter($this->config['adapter']);
-        }
+        $adapter = $this->getAdapter();
 
         // Send the first request. If redirected, continue.
         do {
@@ -868,7 +869,7 @@ public function send(Request $request = null)
             }
 
             // check that adapter supports streaming before using it
-            if (is_resource($body) && !($this->adapter instanceof Client\Adapter\StreamInterface)) {
+            if (is_resource($body) && !($adapter instanceof Client\Adapter\StreamInterface)) {
                 throw new Client\Exception\RuntimeException('Adapter does not support streaming');
             }
 
@@ -896,15 +897,15 @@ public function send(Request $request = null)
                     rewind($stream);
                 }
                 // cleanup the adapter
-                $this->adapter->setOutputStream(null);
+                $adapter->setOutputStream(null);
                 $response = Response\Stream::fromStream($response, $stream);
                 $response->setStreamName($this->streamName);
                 if (!is_string($this->config['outputstream'])) {
                     // we used temp name, will need to clean up
                     $response->setCleanup(true);
                 }
             } else {
-                $response = Response::fromString($response);
+                $response = $this->getResponse()->fromString($response);
             }
 
             // Get the cookies from response (if any)
@@ -1153,9 +1154,10 @@ protected function prepareHeaders($body, $uri)
         }
 
         // Merge the headers of the request (if any)
-        $requestHeaders = $this->getRequest()->getHeaders()->toArray();
-        foreach ($requestHeaders as $key => $value) {
-            $headers[$key] = $value;
+        // here we need right 'http field' and not lowercase letters
+        $requestHeaders = $this->getRequest()->getHeaders();
+        foreach ($requestHeaders as $requestHeaderElement) {
+            $headers[$requestHeaderElement->getFieldName()] = $requestHeaderElement->getFieldValue();
         }
         return $headers;
     }

diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
@@ -278,17 +278,15 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
                 if (isset($this->config['curloptions'][CURLOPT_INFILE])) {
                     // Now we will probably already have Content-Length set, so that we have to delete it
                     // from $headers at this point:
-                    foreach ($headers AS $k => $header) {
-                        if (preg_match('/Content-Length:\s*(\d+)/i', $header, $m)) {
-                            if (is_resource($body)) {
-                                $this->config['curloptions'][CURLOPT_INFILESIZE] = (int) $m[1];
-                            }
-                            unset($headers[$k]);
-                        }
+                    if (!isset($headers['Content-Length'])
+                        && !isset($this->config['curloptions'][CURLOPT_INFILESIZE])
+                    ) {
+                        throw new AdapterException\RuntimeException("Cannot set a file-handle for cURL option CURLOPT_INFILE without also setting its size in CURLOPT_INFILESIZE.");
                     }
 
-                    if (!isset($this->config['curloptions'][CURLOPT_INFILESIZE])) {
-                        throw new AdapterException\RuntimeException("Cannot set a file-handle for cURL option CURLOPT_INFILE without also setting its size in CURLOPT_INFILESIZE.");
+                    if (isset($headers['Content-Length'])) {
+                        $this->config['curloptions'][CURLOPT_INFILESIZE] = (int) $headers['Content-Length'];
+                        unset($headers['Content-Length']);
                     }
 
                     if (is_resource($body)) {
@@ -427,6 +425,14 @@ public function write($method, $uri, $httpVersion = 1.1, $headers = array(), $bo
             $this->response = str_ireplace("Transfer-Encoding: chunked\r\n", '', $this->response);
         }
 
+        // cURL can automatically handle content encoding; prevent double-decoding from occurring
+        if (isset($this->config['curloptions'][CURLOPT_ENCODING])
+            && '' == $this->config['curloptions'][CURLOPT_ENCODING]
+            && stripos($this->response, "Content-Encoding: gzip\r\n")
+        ) {
+            $this->response = str_ireplace("Content-Encoding: gzip\r\n", '', $this->response);
+        }
+
         // Eliminate multiple HTTP responses.
         do {
             $parts  = preg_split('|(?:\r?\n){2}|m', $this->response, 2);

diff --git a/src/Header/AbstractDate.php b/src/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/src/Header/AbstractLocation.php b/src/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/src/Header/AcceptRanges.php b/src/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/src/Header/Age.php b/src/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/src/Header/Allow.php b/src/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/src/Header/AuthenticationInfo.php b/src/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/src/Header/Authorization.php b/src/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/src/Header/CacheControl.php b/src/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/src/Header/Connection.php b/src/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/src/Header/ContentDisposition.php b/src/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/src/Header/ContentEncoding.php b/src/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/src/Header/ContentLanguage.php b/src/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/src/Header/ContentLength.php b/src/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/src/Header/ContentMD5.php b/src/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/src/Header/ContentRange.php b/src/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/src/Header/ContentTransferEncoding.php b/src/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/src/Header/ContentType.php b/src/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/src/Header/Cookie.php b/src/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/src/Header/Etag.php b/src/Header/Etag.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) !== 'etag') {

diff --git a/src/Header/Expect.php b/src/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/src/Header/From.php b/src/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/src/Header/GenericHeader.php b/src/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
      *
@@ -61,7 +80,7 @@ public function __construct($fieldName = null, $fieldValue = null)
      *
      * @param  string $fieldName
      * @return GenericHeader
-     * @throws Exception\InvalidArgumentException(
+     * @throws Exception\InvalidArgumentException If the name does not match with RFC 2616 format.
      */
     public function setFieldName($fieldName)
     {
@@ -70,12 +89,19 @@ public function setFieldName($fieldName)
         }
 
         // Pre-filter to normalize valid characters, change underscore to dash
-        $fieldName = str_replace(' ', '-', ucwords(str_replace(array('_', '-'), ' ', $fieldName)));
-
-        // Validate what we have
-        if (!preg_match('/^[a-z][a-z0-9-]*$/i', $fieldName)) {
+        $fieldName = str_replace('_', '-', $fieldName);
+
+        /*
+         * Following RFC 2616 section 4.2
+         *
+         * message-header = field-name ":" [ field-value ]
+         * field-name     = token
+         *
+         * @see http://tools.ietf.org/html/rfc2616#section-2.2 for token definition.
+         */
+        if (!preg_match('/^[!#-\'*+\-\.0-9A-Z\^-z|~]+$/', $fieldName)) {
             throw new Exception\InvalidArgumentException(
-                'Header name must start with a letter, and consist of only letters, numbers, and dashes'
+                'Header name must be a valid RFC 2616 (section 4.2) field-name.'
             );
         }
 

diff --git a/src/Header/GenericMultiHeader.php b/src/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();