Merge branch 'hotfix/6140' into develop

Forward port zendframework/zendframework#6140
zendframework · Apr 15, 2014 · 7763941 · 7763941
commit 7763941
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Client/Adapter/Socket.php b/src/Client/Adapter/Socket.php
@@ -28,10 +28,10 @@ class Socket implements HttpAdapter, StreamInterface
      * @var array
      */
     protected static $sslCryptoTypes = array(
-            'ssl'   => STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            'sslv2' => STREAM_CRYPTO_METHOD_SSLv2_CLIENT,
-            'sslv3' => STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            'tls'   => STREAM_CRYPTO_METHOD_TLS_CLIENT
+        'ssl'   => STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
+        'sslv2' => STREAM_CRYPTO_METHOD_SSLv2_CLIENT,
+        'sslv3' => STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
+        'tls'   => STREAM_CRYPTO_METHOD_TLS_CLIENT,
     );
 
     /**
@@ -69,7 +69,7 @@ class Socket implements HttpAdapter, StreamInterface
         'sslcafile'             => null,
         'sslcapath'             => null,
         'sslallowselfsigned'    => false,
-        'sslusecontext'         => false
+        'sslusecontext'         => false,
     );
 
     /**