diff options
| author | friendica <info@friendica.com> | 2014-03-24 19:01:20 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-03-24 19:01:20 -0700 |
| commit | 235b0335608439b98d74a205a380d0f77baf6b4f (patch) | |
| tree | dac64b919caaab4a563637bc72ed49ea58f0b98c | |
| parent | 10f18675214acff5b4246bd6c4b13807b8e0e44f (diff) | |
| download | volse-hubzilla-235b0335608439b98d74a205a380d0f77baf6b4f.tar.gz volse-hubzilla-235b0335608439b98d74a205a380d0f77baf6b4f.tar.bz2 volse-hubzilla-235b0335608439b98d74a205a380d0f77baf6b4f.zip | |
that should fix it.
| -rw-r--r-- | include/network.php | 4 | ||||
| -rw-r--r-- | include/socgraph.php | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/network.php b/include/network.php index 8e781272a..14771d88f 100644 --- a/include/network.php +++ b/include/network.php @@ -47,7 +47,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { if(! $ciphers) $ciphers = 'ALL:!eNULL'; -// @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); + @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); if (x($opts,'accept_content')){ @curl_setopt($ch,CURLOPT_HTTPHEADER, array ( @@ -155,7 +155,7 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { if(! $ciphers) $ciphers = 'ALL:!eNULL'; -// @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, Z_CURL_CIPHERS); + @curl_setopt($ch, CURLOPT_SSL_CIPHER_LIST, $ciphers); if (x($opts,'accept_content')){ diff --git a/include/socgraph.php b/include/socgraph.php index 10d52da66..65e23f9df 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -62,6 +62,11 @@ function poco_load($xchan = '',$url = null) { $j = json_decode($s['body'],true); + if(! $j) { + logger('poco_load: unable to json_decode returned data.'); + return; + } + logger('poco_load: ' . print_r($j,true),LOGGER_DATA); if($xchan) { |