mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-63789 search_solr: use proxy creds, if any

Browse Source 
Also use proxy port, IF any.
This commit is contained in:
Matteo Scaramuccia 2018-10-27 17:13:36 +02:00
parent 8b019fb709
commit 13719f2ebb
1 changed files with 7 additions and 1 deletions
Show Stats 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 . '/')) {
$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')) {