harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
friendica 2012-11-13 14:58:58 -08:00
parent 35a6dd1cae
commit b7ccf08cea
3 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
done
View File

@ -87,7 +87,7 @@ mod/
+ apps.php + apps.php
+ attach.php + attach.php
? auth.php ? auth.php
cb.php - cb.php
common.php common.php
community.php community.php
contactgroup.php contactgroup.php

12
include/network.php
View File

@ -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_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)) { 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_time = intval(get_config('system','curl_timeout'));
@curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60)); @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, true);
@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
$prx = get_config('system','proxy'); $prx = get_config('system','proxy');
if(strlen($prx)) { if(strlen($prx)) {
@ -310,8 +307,9 @@ function z_post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0
if($headers) if($headers)
curl_setopt($ch, CURLOPT_HTTPHEADER, $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'); $prx = get_config('system','proxy');
if(strlen($prx)) { if(strlen($prx)) {
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);

24
mod/cb.php
View File

@ -1,24 +0,0 @@
<?php
/**
* General purpose landing page for plugins/addons
*/
function cb_init(&$a) {
call_hooks('cb_init');
}
function cb_post(&$a) {
call_hooks('cb_post', $_POST);
}
function cb_afterpost(&$a) {
call_hooks('cb_afterpost');
}
function cb_content(&$a) {
$o = '';
call_hooks('cb_content', $o);
return $o;
}