MDL-63789 search_solr: use proxy creds, if any

Also use proxy port, IF any.
moodle · Nov 2, 2018 · 13719f2 · 13719f2
1 parent 8b019fb
commit 13719f2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/search/engine/solr/classes/engine.php b/search/engine/solr/classes/engine.php
@@ -1257,7 +1257,13 @@ protected function get_search_client($triggerexception = true) {
 
         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')) {