From 13719f2ebb5ea27591dc823903986dcb456c706c Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Sat, 27 Oct 2018 17:13:36 +0200 Subject: [PATCH] MDL-63789 search_solr: use proxy creds, if any Also use proxy port, IF any. --- search/engine/solr/classes/engine.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php index 21199d486fe..74b2e08e7b1 100644 --- a/search/engine/solr/classes/engine.php +++ b/search/engine/solr/classes/engine.php @@ -1257,7 +1257,13 @@ class engine extends \core_search\engine { if ($CFG->proxyhost && !is_proxybypass('http://' . $this->config->server_hostname . '/')) { $options['proxy_host'] = $CFG->proxyhost; - $options['proxy_port'] = $CFG->proxyport; + if (!empty($CFG->proxyport)) { + $options['proxy_port'] = $CFG->proxyport; + } + if (!empty($CFG->proxyuser) && !empty($CFG->proxypassword)) { + $options['proxy_login'] = $CFG->proxyuser; + $options['proxy_password'] = $CFG->proxypassword; + } } if (!class_exists('\SolrClient')) { -- 2.43.0