From 7375e305060df3818f01a96fbbd811921468ad89 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 25 Mar 2014 15:19:18 -0700 Subject: This should be a slight improvement in setting ciphers - we'll punt on RedHat but open up the list just for openssl distros which seem to have all the problems at the moment. --- include/network.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'include/network.php') diff --git a/include/network.php b/include/network.php index 14771d88f..9f68328b7 100644 --- a/include/network.php +++ b/include/network.php @@ -44,10 +44,8 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { @curl_setopt($ch, CURLOPT_USERAGENT, "Mozilla/5.0 (compatible; Red)"); $ciphers = @get_config('system','curl_ssl_ciphers'); - if(! $ciphers) - $ciphers = 'ALL:!eNULL'; - - @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); + if($ciphers) + @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); if (x($opts,'accept_content')){ @curl_setopt($ch,CURLOPT_HTTPHEADER, array ( @@ -152,10 +150,8 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { @curl_setopt($ch, CURLOPT_USERAGENT, "Red"); $ciphers = @get_config('system','curl_ssl_ciphers'); - if(! $ciphers) - $ciphers = 'ALL:!eNULL'; - - @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); + if($ciphers) + @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); if (x($opts,'accept_content')){ -- cgit v1.2.3