[mms] Fix BC-breaking regression with self-signed TLS certificates in…

…troduced by PHP 5.6.
horde · Jul 1, 2014 · 0dcd8ae · 0dcd8ae
1 parent 394efc9
commit 0dcd8ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/framework/Socket_Client/lib/Horde/Socket/Client.php b/framework/Socket_Client/lib/Horde/Socket/Client.php
@@ -178,7 +178,17 @@ protected function _connect($host, $port, $timeout, $secure, $retries = 0)
             $conn . $host . ':' . $port,
             $error_number,
             $error_string,
-            $timeout
+            $timeout,
+            STREAM_CLIENT_CONNECT,
+            /* @todo: As of PHP 5.6, TLS connections require valid certs.
+             * However, this is BC-breaking to this library. For now, keep
+             * pre-5.6 behavior. */
+            stream_context_create(array(
+                'ssl' => array(
+                    'verify_peer' => false,
+                    'verify_peer_name' => false
+                )
+            ))
         );
 
         if ($this->_stream === false) {

diff --git a/framework/Socket_Client/package.xml b/framework/Socket_Client/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Fix BC-breaking regression with self-signed TLS certificates introduced by PHP 5.6.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -131,7 +131,7 @@
    <date>2014-01-22</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Fix BC-breaking regression with self-signed TLS certificates introduced by PHP 5.6.
    </notes>
   </release>
  </changelog>