Merge remote-tracking branch 'upstream/develop' into 1503-hashtag-handling

diff --git a/include/network.php b/include/network.php
index ab7a9c6297dfbe70772aa9f564e43c5b85c089e0..911d9784a5e82ac0b576bcf9352840205b5c0d2c 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -50,6 +50,7 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
 
        $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));
 
        $prx = get_config('system','proxy');
        if(strlen($prx)) {
@@ -158,6 +159,7 @@ 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));
        $prx = get_config('system','proxy');
        if(strlen($prx)) {
                curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);