Commit 8000e6af authored by Eloy Lafuente's avatar Eloy Lafuente
Browse files

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

parents 8c9eecde 411b5f3a
......@@ -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)) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment