no need to call anymore $client->setSSLVerifyHost(2) to silence a curl warning when...

[plcapi.git] / lib / xmlrpc.inc

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index ea775f8..e5be7f7 100644 (file)
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -1621,6 +1621,13 @@
                                {\r
                                        curl_setopt($curl, CURLOPT_SSLKEYPASSWD, $keypass);\r
                                }\r
+\r
+                // Upgrade transparently to more stringent check for versions of php which do not support otherwise.\r
+                // Doing it in constructor would be cleaner; doing it here saves us a couple of function calls\r
+                if($this->verifyhost == 1 && $info = curl_version() && version_compare($info['version'], '7.28.1') >= 0)\r
+                {\r
+                    $this->verifyhost = 2;\r
+                }\r
                                // whether to verify cert's common name (CN); 0 for no, 1 to verify that it exists, and 2 to verify that it matches the hostname used\r
                                curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, $this->verifyhost);\r
                        }\r