L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'm34_MDL-63789_Search_SOLR_Fixes_Proxy_Auth' of https://github.com/scara/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-11-07 00:08:32 +01:00
parent 75bcad753d 3899e71bf2
commit ed2d5791ed
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search/engine/solr/classes/engine.php
+7 -1
View File
@@ -1170,7 +1170,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')) {