mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-60838-master' of https://github.com/sammarshallou/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2017-11-28 20:48:15 +01:00
commit 8000e6af01
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
search/engine/solr/classes/engine.php
View File

@ -1227,6 +1227,9 @@ class engine extends \core_search\engine {
}
}
// Set timeout as for Solr client.
$options['CURLOPT_TIMEOUT'] = !empty($this->config->server_timeout) ? $this->config->server_timeout : '30';
$this->curl->setopt($options);
if (!empty($this->config->server_username) && !empty($this->config->server_password)) {