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

Protocol: now set data['alg'] on all encapsulated encrypted packets, so that we can more easily retire 'aes256cbc' once it is no longer viable.

Browse Source
This commit is contained in:
friendica
2013-11-20 15:20:12 -08:00
parent f6c41e61ac
commit d7ee552c57
12 changed files with 62 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
boot.php
View File

@@ -803,12 +803,6 @@ class App {
$scheme = $this->scheme;
// if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
// if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) {
// $scheme = 'https';
// }
// }
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
return $this->baseurl;
}
@@ -995,6 +989,9 @@ class App {
)) . $this->page['htmlhead'];
}
// The following curl functions will go away once we've converted
// all instances of (fetch|post)_url() to z_(fetch|post)_url()
function set_curl_code($code) {
$this->curl_code = $code;
}
@@ -1186,7 +1183,6 @@ function is_ajax() {
// $_SERVER variables, and synchronising the state of installed plugins.
function check_config(&$a) {
$build = get_config('system','db_version');