Bugfix: the curl option CURLOPT_SSL_VERIFYHOST is problematic

diff --git a/include/ParseUrl.php b/include/ParseUrl.php
index 3a2fe9d53c6b818b39613d7d4f769bd34691ab6e..e9ac527a1ad455fe8c9c29b8ba3ee1b987637b2c 100644 (file)
--- a/include/ParseUrl.php
+++ b/include/ParseUrl.php
@@ -146,7 +146,9 @@ class ParseUrl {
                curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
                curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
                curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
-               curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false));
+               if ($check_cert) {
+                       @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+               }
 
                $header = curl_exec($ch);
                $curl_info = @curl_getinfo($ch);

diff --git a/include/network.php b/include/network.php
index 03f65a5190a08182d11939f30b0eb031ab955a94..749f996f8c1a50605b3a03750c71461d315db7c0 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -118,7 +118,9 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 
        $check_cert = get_config('system','verifyssl');
        @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
-       @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false));
+       if ($check_cert) {
+               @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+       }
 
        $prx = get_config('system','proxy');
        if(strlen($prx)) {
@@ -265,7 +267,9 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
 
        $check_cert = get_config('system','verifyssl');
        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
-       curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, (($check_cert) ? 2 : false));
+       if ($check_cert) {
+               @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+       }
        $prx = get_config('system','proxy');
        if(strlen($prx)) {
                curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);

diff --git a/include/poller.php b/include/poller.php
index e8bfb88389aebcb08355d5792df373f89b6a9d07..8be4c1835c4847277b6f2c5eddee34a42e29bc39 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -11,7 +11,6 @@ if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
 }
 
 use \Friendica\Core\Config;
-use \Friendica\Core\PConfig;
 
 require_once("boot.php");
 
@@ -29,6 +28,8 @@ function poller_run($argv, $argc){
                unset($db_host, $db_user, $db_pass, $db_data);
        };
 
+       Config::load();
+
        // Quit when in maintenance
        if (Config::get('system', 'maintenance', true)) {
                return;