Merge branch 'wip-MDL-58915-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE

2017-10-19 15:44:25 +02:00
parent 2b1827a6d1 d250014ef7
commit b4d4e7885a
1 changed files with 2 additions and 1 deletions
@@ -1198,7 +1198,8 @@ class engine extends \core_search\engine {
            return $this->curl;
        }

-        $this->curl = new \curl();
+        // Connection to Solr is allowed to use 'localhost' and other potentially blocked hosts/ports.
+        $this->curl = new \curl(['ignoresecurity' => true]);

        $options = array();
        // Build the SSL options. Based on pecl-solr and general testing.