Merge branch 'release/2.11.0'

Author: michalbundyra

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.11.0 - TBD
+## 2.11.0 - 2019-12-03
 
 ### Added
 
@@ -34,28 +34,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#200](https://github.com/zendframework/zend-http/pull/200) fixes support for directives without value in Content Security Policy header.
 
-## 2.10.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.10.1 - 2019-12-02
 
 ### Added

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2018, Zend Technologies USA, Inc.
+Copyright (c) 2005-2019, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

composer.json

@@ -47,8 +47,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.10.x-dev",
-            "dev-develop": "2.11.x-dev"
+            "dev-master": "2.11.x-dev",
+            "dev-develop": "2.12.x-dev"
         }
     },
     "scripts": {

composer.lock

@@ -36,15 +36,15 @@
              symbolically link or copy the files in test/Client/_files to a
              directory under your web server(s) document root and set this
              constant to point to the URL of this directory. -->
-        <env name="TESTS_ZEND_HTTP_CLIENT_BASEURI" value="http://127.0.0.1" />
-        <env name="TESTS_ZEND_HTTP_CLIENT_ONLINE" value="true" />
+        <env name="TESTS_ZEND_HTTP_CLIENT_BASEURI" value="false" />
+        <env name="TESTS_ZEND_HTTP_CLIENT_ONLINE" value="false" />
 
         <!-- Zend\Http\Client\Proxy tests
 
              HTTP proxy to be used for testing the Proxy adapter. Set to a
              string of the form 'host:port'. Set to null to skip HTTP proxy
              tests. -->
-        <env name="TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY" value="127.0.0.1:8081" />
+        <env name="TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY" value="false" />
         <env name="TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY_USER" value="" />
         <env name="TESTS_ZEND_HTTP_CLIENT_HTTP_PROXY_PASS" value="" />