Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MDL-32589 phpunit: allow proxy server specification via config.php

  • Loading branch information...
commit 366c6adba3afe2724b22e08d9c8f7338d8d6b148 1 parent aa753ac
Petr Skoda skodak authored
Showing with 3 additions and 1 deletion.
  1. +3 −1 lib/phpunit/bootstrap.php
4 lib/phpunit/bootstrap.php
View
@@ -158,7 +158,9 @@
$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) {
Please sign in to comment.
Something went wrong with that request. Please try again.