From 411b5f3a025c0aaaaf1947c58869db8ba179a285 Mon Sep 17 00:00:00 2001
From: sam marshall <s.marshall@open.ac.uk>
Date: Thu, 16 Nov 2017 16:50:08 +0000
Subject: [PATCH] MDL-60838 core_search: File upload does not honour timeout

---
 search/engine/solr/classes/engine.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php
index 55206d38acf..1f0a1be635b 100644
--- a/search/engine/solr/classes/engine.php
+++ b/search/engine/solr/classes/engine.php
@@ -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)) {