MDL-14659

Add bypass list for proxy usage.

diff --git a/admin/settings/server.php b/admin/settings/server.php
index ef8c48322d8647aa7d092b59a6e4eccacd78b7f6..472f106e87402b038eb426fb705b6517b5d2e4a7 100644 (file)
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -156,6 +156,7 @@ if (defined('CURLPROXY_SOCKS5')) {
 $temp->add(new admin_setting_configselect('proxytype', get_string('proxytype', 'admin'), get_string('configproxytype','admin'), 'HTTP', $options));
 $temp->add(new admin_setting_configtext('proxyuser', get_string('proxyuser', 'admin'), get_string('configproxyuser', 'admin'), ''));
 $temp->add(new admin_setting_configpasswordunmask('proxypassword', get_string('proxypassword', 'admin'), get_string('configproxypassword', 'admin'), ''));
+$temp->add(new admin_setting_configtext('proxybypass', get_string('proxybypass', 'admin'), get_string('configproxybypass', 'admin'), 'localhost, 127.0.0.1'));
 $ADMIN->add('server', $temp);
 
 $ADMIN->add('server', new admin_externalpage('maintenancemode', get_string('sitemaintenancemode', 'admin'), "$CFG->wwwroot/$CFG->admin/maintenance.php"));

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index db437f0fc651ab9341f07cbabf77780214bd842f..55232c0c72c52ba6f5177e6687a50943342fac0d 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -176,6 +176,7 @@ $string['configpathtoclam'] = 'Path to clam AV.  Probably something like /usr/bi
 $string['configpathtodu'] = 'Path to du. Probably something like /usr/bin/du. If you enter this, pages that display directory contents will run much faster for directories with a lot of files.';
 $string['configperfdebug'] = 'If you turn this on, performance info will be printed in the footer of the standard theme';
 $string['configprotectusernames'] = 'By default forget_password.php does not display any hints that would allow guessing of usernames or email addresses.';
+$string['configproxybypass'] = 'Comma separated list of (partial) hostnames or IPs that should bypass proxy (e.g., 192.168., .mydomain.com)';
 $string['configproxyhost'] = 'If this <b>server</b> needs to use a proxy computer (eg a firewall) to access the Internet, then provide the proxy hostname here.  Otherwise leave it blank.';
 $string['configproxypassword'] = 'Password needed to access internet through proxy if required, empty if none (PHP cURL extension required).';
 $string['configproxyport'] = 'If this server needs to use a proxy computer, then provide the proxy port here.';
@@ -578,6 +579,7 @@ $string['profilevisiblenone'] = 'Not visible';
 $string['profilevisibleprivate'] = 'Visible to user';
 $string['profilevisible'] = 'Who is this field visible to?';
 $string['protectusernames'] = 'Protect usernames';
+$string['proxybypass'] = 'Proxy bypass hosts';
 $string['proxyhost'] = 'Proxy host';
 $string['proxyport'] = 'Proxy port';
 $string['proxypassword'] = 'Proxy password';