Merge branch 'hotfix/revert-zf2-490-fix' of https://github.com/ralphschindler/zf2

Author: weierophinney

src/Client/Adapter/Socket.php

@@ -191,19 +191,14 @@ public function connect($host, $port = 80, $secure = false)
                                                     $this->config['sslverifypeer'])) {
                         throw new AdapterException\RuntimeException('Unable to set sslverifypeer option');
                     }
-                    if ($this->config['sslverifypeer'] == true) {
-                        if ($this->config['sslcapath'] == null || !is_dir($this->config['sslcapath'])) {
-                            throw new AdapterException\RuntimeException('Invalid sslcapath provided; not a directory');
-                        }
-                        if (! stream_context_set_option($context, 'ssl', 'capath',
-                                                        $this->config['sslcapath'])) {
-                            throw new AdapterException\RuntimeException('Unable to set sslcapath option');
-                        }
-                        if ($this->config['sslallowselfsigned'] !== null) {
-                            if (! stream_context_set_option($context, 'ssl', 'allow_self_signed',
-                                                            $this->config['sslallowselfsigned'])) {
-                                throw new AdapterException\RuntimeException('Unable to set sslallowselfsigned option');
-                            }
+                    if (! stream_context_set_option($context, 'ssl', 'capath',
+                                                    $this->config['sslcapath'])) {
+                        throw new AdapterException\RuntimeException('Unable to set sslcapath option');
+                    }
+                    if ($this->config['sslallowselfsigned'] !== null) {
+                        if (! stream_context_set_option($context, 'ssl', 'allow_self_signed',
+                                                        $this->config['sslallowselfsigned'])) {
+                            throw new AdapterException\RuntimeException('Unable to set sslallowselfsigned option');
                         }
                     }
                 }

test/Client/SocketTest.php

@@ -244,18 +244,6 @@ public function testMultibyteChunkedResponseZF6218()
         $this->assertEquals($md5, md5($response->getBody()));
     }
 
-    /**
-     * @group ZF2-490
-     */
-    public function testSocketThrowsExceptionWhenSslCaPathNotProvided()
-    {
-        $request = new \Zend\Http\Request();
-        $request->setUri('https://www.google.com');
-
-        $this->setExpectedException('Zend\Http\Client\Adapter\Exception\RuntimeException', 'Invalid sslcapath provided; not a directory');
-        $this->client->send($request);
-    }
-
     /**
      * Data Providers
      */