From b7ccf08ceac4d648f97f0f422e2e6457840a1af2 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 13 Nov 2012 14:58:58 -0800 Subject: self-signed cert? Since you won't listen to me and insist on annoying your friends, sorry, but red won't talk to you. This snake is dead. --- include/network.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'include/network.php') diff --git a/include/network.php b/include/network.php index b3da192a0..47fa1d939 100644 --- a/include/network.php +++ b/include/network.php @@ -202,7 +202,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accep } @curl_setopt($ch, CURLOPT_RETURNTRANSFER,true); - @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica)"); + @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Friendica Red)"); if(intval($timeout)) { @@ -212,11 +212,8 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accep $curl_time = intval(get_config('system','curl_timeout')); @curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60)); } - // by default we will allow self-signed certs - // but you can override this - $check_cert = get_config('system','verifyssl'); - @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false)); + @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); $prx = get_config('system','proxy'); if(strlen($prx)) { @@ -310,8 +307,9 @@ function z_post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0 if($headers) curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); - $check_cert = get_config('system','verifyssl'); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false)); + + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); + $prx = get_config('system','proxy'); if(strlen($prx)) { curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); -- cgit v1.2.3