Merge remote-tracking branch 'upstream/master'

Conflicts:
	library/Zend/Soap/Wsdl.php
	tests/Zend/Soap/Server/DocumentLiteralWrapperTest.php
	tests/Zend/Soap/WsdlTest.php

Author: Grzegorz Drozd

.gitmodules

@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-http",
-    "description": "Zend\\Http component",
+    "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.3.23",
+        "php": ">=5.3.3",
         "zendframework/zend-loader": "self.version",
         "zendframework/zend-stdlib": "self.version",
         "zendframework/zend-uri": "self.version",
@@ -25,14 +25,14 @@
             "dev-develop": "2.5-dev"
         }
     },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "satooshi/php-coveralls": "dev-master",
-        "phpunit/PHPUnit": "~4.0"
-    },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Http\\": "test/"
         }
+    },
+    "require-dev": {
+        "fabpot/php-cs-fixer": "1.7.*",
+        "satooshi/php-coveralls": "dev-master",
+        "phpunit/PHPUnit": "~4.0"
     }
 }

composer.json

@@ -0,0 +1,108 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Http
+ */
+
+namespace Zend\Http;
+
+use Zend\Stdlib\Message;
+
+/**
+ * HTTP standard message (Request/Response)
+ *
+ * @category  Zend
+ * @package   Zend_Http
+ * @link      http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4
+ */
+abstract class AbstractMessage extends Message
+{
+    /**#@+
+     * @const string Version constant numbers
+     */
+    const VERSION_10 = '1.0';
+    const VERSION_11 = '1.1';
+    /**#@-*/
+
+    /**
+     * @var string
+     */
+    protected $version = self::VERSION_11;
+
+    /**
+     * @var Headers|null
+     */
+    protected $headers = null;
+
+    /**
+     * Set the HTTP version for this object, one of 1.0 or 1.1
+     * (AbstractMessage::VERSION_10, AbstractMessage::VERSION_11)
+     *
+     * @param  string $version (Must be 1.0 or 1.1)
+     * @return AbstractMessage
+     * @throws Exception\InvalidArgumentException
+     */
+    public function setVersion($version)
+    {
+        if ($version != self::VERSION_10 && $version != self::VERSION_11) {
+            throw new Exception\InvalidArgumentException(
+                'Not valid or not supported HTTP version: ' . $version
+            );
+        }
+        $this->version = $version;
+        return $this;
+    }
+
+    /**
+     * Return the HTTP version for this request
+     *
+     * @return string
+     */
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * Provide an alternate Parameter Container implementation for headers in this object,
+     * (this is NOT the primary API for value setting, for that see getHeaders())
+     *
+     * @see    getHeaders()
+     * @param  Headers $headers
+     * @return AbstractMessage
+     */
+    public function setHeaders(Headers $headers)
+    {
+        $this->headers = $headers;
+        return $this;
+    }
+
+    /**
+     * Return the header container responsible for headers
+     *
+     * @return Headers
+     */
+    public function getHeaders()
+    {
+        if ($this->headers === null || is_string($this->headers)) {
+            // this is only here for fromString lazy loading
+            $this->headers = (is_string($this->headers)) ? Headers::fromString($this->headers) : new Headers();
+        }
+
+        return $this->headers;
+    }
+
+    /**
+     * Allow PHP casting of this object
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+}