moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mnet: Bugfix: Prevent infinite loop when 2 community hubs peer for the first time

Browse source
This commit is contained in:
donal72 2007-01-15 08:31:58 +00:00
parent e931feddaf
commit 85d2d959d5
3 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mnet/peer.php
View file

@ -25,7 +25,7 @@ class mnet_peer {
return true;
}
function bootstrap($wwwroot) {
function bootstrap($wwwroot, $pubkey = null) {
if (substr($wwwroot, 0, -1) == '/') {
$wwwroot = substr($wwwroot, 0, -1);
@ -59,7 +59,11 @@ class mnet_peer {
$this->wwwroot = $wwwroot;
$this->ip_address = $ip_address;
$this->deleted = 0;
$this->public_key = clean_param(mnet_get_public_key($this->wwwroot), PARAM_PEM);
if(empty($pubkey)) {
$this->public_key = clean_param(mnet_get_public_key($this->wwwroot), PARAM_PEM);
} else {
$this->public_key = clean_param($pubkey, PARAM_PEM);
}
$this->public_key_expires = $this->check_common_name($this->public_key);
$this->last_connect_time = 0;
$this->last_log_id = 0;