From 366c6adba3afe2724b22e08d9c8f7338d8d6b148 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Thu, 26 Apr 2012 20:31:19 +0200 Subject: [PATCH] MDL-32589 phpunit: allow proxy server specification via config.php --- lib/phpunit/bootstrap.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/phpunit/bootstrap.php b/lib/phpunit/bootstrap.php index 186b4d68f05..9a304d7364e 100644 --- a/lib/phpunit/bootstrap.php +++ b/lib/phpunit/bootstrap.php @@ -158,7 +158,9 @@ $CFG->prefix = isset($CFG->phpunit_prefix) ? $CFG->phpunit_prefix : $CFG->pre $CFG->dboptions = isset($CFG->phpunit_dboptions) ? $CFG->phpunit_dboptions : $CFG->dboptions; $allowed = array('wwwroot', 'dataroot', 'dirroot', 'admin', 'directorypermissions', 'filepermissions', - 'dbtype', 'dblibrary', 'dbhost', 'dbname', 'dbuser', 'dbpass', 'prefix', 'dboptions'); + 'dbtype', 'dblibrary', 'dbhost', 'dbname', 'dbuser', 'dbpass', 'prefix', 'dboptions', + 'webproxy', 'proxyhost', 'proxyport', 'proxytype', 'proxyuser', 'proxypassword', 'proxybypass', // keep proxy settings from config.php + ); $productioncfg = (array)$CFG; $CFG = new stdClass(); foreach ($productioncfg as $key=>$value) {