moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'm36_MDL-63789_Search_SOLR_Fixes_Proxy_Auth' of https://github.com/scara/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-11-07 00:08:12 +01:00
commit ef79de12ee
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
search/engine/solr/classes/engine.php
View file

@ -1257,7 +1257,13 @@ class engine extends \core_search\engine {
if ($CFG->proxyhost && !is_proxybypass('http://' . $this->config->server_hostname . '/')) { if ($CFG->proxyhost && !is_proxybypass('http://' . $this->config->server_hostname . '/')) {
$options['proxy_host'] = $CFG->proxyhost; $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')) { if (!class_exists('\SolrClient')) {