Merge branch 'hotfix/168' into develop

Forward port #168

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.9.1 - TBD
+## 2.9.1 - 2019-01-22
 
 ### Added
 
@@ -44,7 +44,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#168](https://github.com/zendframework/zend-http/pull/168) fixes a problem when validating the connection timeout for the `Curl` and
+  `Socket` client adapters; it now correctly identifies both integer and string
+  integer values.
 
 ## 2.9.0 - 2019-01-08
 

src/Client/Adapter/Curl.php

@@ -209,7 +209,7 @@ public function connect($host, $port = 80, $secure = false)
             $connectTimeout = null;
         }
 
-        if ($connectTimeout !== null && (! is_int($connectTimeout) || ! is_numeric($connectTimeout))) {
+        if ($connectTimeout !== null && ! is_numeric($connectTimeout)) {
             throw new AdapterException\InvalidArgumentException(sprintf(
                 'integer or numeric string expected, got %s',
                 gettype($connectTimeout)

src/Client/Adapter/Socket.php

@@ -263,7 +263,7 @@ public function connect($host, $port = 80, $secure = false)
                 $connectTimeout = $this->config['timeout'];
             }
 
-            if ($connectTimeout !== null && (! is_int($connectTimeout) || ! is_numeric($connectTimeout))) {
+            if ($connectTimeout !== null && ! is_numeric($connectTimeout)) {
                 throw new AdapterException\InvalidArgumentException(sprintf(
                     'integer or numeric string expected, got %s',
                     gettype($connectTimeout)