Merge branch 'MDL-39353-29' of https://github.com/rtcn2/moodle into MOODLE_29_STABLE

2015-06-16 11:33:16 +08:00
parent ca4c8b1942 6e0401d61f
commit f934fdf46c
1 changed files with 13 additions and 0 deletions
@@ -46,9 +46,22 @@ class webservice_xmlrpc_client extends Zend_XmlRpc_Client {
     * @param string $token the token used to do the web service call
     */
    public function __construct($serverurl, $token) {
+        global $CFG;
        $this->serverurl = $serverurl;
        $serverurl = $serverurl . '?wstoken=' . $token;
        parent::__construct($serverurl);
+        if (!empty($CFG->proxyhost) && !is_proxybypass($serverurl)) {
+            $config = array(
+                'adapter'    => 'Zend_Http_Client_Adapter_Proxy',
+                'proxy_host' => $CFG->proxyhost,
+                'proxy_user' => !empty($CFG->proxyuser) ? $CFG->proxyuser : null,
+                'proxy_pass' => !empty($CFG->proxypassword) ? $CFG->proxypassword : null
+            );
+            if (!empty($CFG->proxyport)) {
+                $config['proxy_port'] = $CFG->proxyport;
+            }
+            $this->getHttpClient()->setConfig($config);
+        }
    }

    /**