Merge branch 'MDL-60838-m34' of https://github.com/sammarshallou/moodle into MOODLE_34_STABLE

2017-11-28 20:48:27 +01:00
parent 8938d826d9 70a804d98e
commit 7974bbcaf7
1 changed files with 3 additions and 0 deletions
@@ -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)) {