L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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-11-02 23:34:13 +01:00
parent e1e20d0c9b
commit 60735e6bee
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
@@ -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')) {