diff options
| author | friendica <info@friendica.com> | 2014-03-25 15:19:18 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-03-25 15:19:18 -0700 |
| commit | 7375e305060df3818f01a96fbbd811921468ad89 (patch) | |
| tree | 71cd4ebb6ef0bd7fa4434ef6868e141bca84c0b3 /include | |
| parent | f14596b1ebeecf2c75939374136c830e44dbd923 (diff) | |
| download | volse-hubzilla-7375e305060df3818f01a96fbbd811921468ad89.tar.gz volse-hubzilla-7375e305060df3818f01a96fbbd811921468ad89.tar.bz2 volse-hubzilla-7375e305060df3818f01a96fbbd811921468ad89.zip | |
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.
Diffstat (limited to 'include')
| -rw-r--r-- | include/network.php | 12 |
1 files changed, 4 insertions, 8 deletions
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')){ |