From cdd4cf4094df9562f53e175ece8f0bcc4a1cf2f1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 8 Jan 2019 16:00:05 +0100 Subject: [PATCH] proxy: Drop support for throttling only certain mime types Signed-off-by: Michael Tremer --- doc/language_issues.de | 9 ++++++++ doc/language_issues.en | 9 -------- doc/language_issues.es | 9 ++++++++ doc/language_issues.fr | 9 ++++++++ doc/language_issues.it | 9 ++++++++ doc/language_issues.nl | 9 ++++++++ doc/language_issues.pl | 9 ++++++++ doc/language_issues.ru | 9 ++++++++ doc/language_issues.tr | 9 ++++++++ html/cgi-bin/proxy.cgi | 48 ------------------------------------------ 10 files changed, 72 insertions(+), 57 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 3f6accc5eb..f8b84c651b 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -60,7 +60,9 @@ WARNING: translation string unused: advproxy NTLM use integrated auth WARNING: translation string unused: advproxy NTLM use negative access list WARNING: translation string unused: advproxy NTLM use positive access list WARNING: translation string unused: advproxy NTLM user based access restrictions +WARNING: translation string unused: advproxy UA enable filter WARNING: translation string unused: advproxy advanced proxy +WARNING: translation string unused: advproxy allowed web browsers WARNING: translation string unused: advproxy chgwebpwd ERROR WARNING: translation string unused: advproxy chgwebpwd SUCCESS WARNING: translation string unused: advproxy chgwebpwd change password @@ -69,20 +71,27 @@ WARNING: translation string unused: advproxy chgwebpwd new password WARNING: translation string unused: advproxy chgwebpwd new password confirm WARNING: translation string unused: advproxy chgwebpwd old password WARNING: translation string unused: advproxy chgwebpwd username +WARNING: translation string unused: advproxy content based throttling WARNING: translation string unused: advproxy errmsg auth ipcache ttl WARNING: translation string unused: advproxy errmsg change fail WARNING: translation string unused: advproxy errmsg change success WARNING: translation string unused: advproxy errmsg invalid bdc WARNING: translation string unused: advproxy errmsg invalid pdc WARNING: translation string unused: advproxy errmsg invalid user +WARNING: translation string unused: advproxy errmsg no browser WARNING: translation string unused: advproxy errmsg no password WARNING: translation string unused: advproxy errmsg ntlm domain WARNING: translation string unused: advproxy errmsg ntlm pdc WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy invalid num of children +WARNING: translation string unused: advproxy no clients defined WARNING: translation string unused: advproxy redirector children WARNING: translation string unused: advproxy ssadvanced proxy +WARNING: translation string unused: advproxy throttle binary +WARNING: translation string unused: advproxy throttle dskimg +WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: advproxy web browser WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_issues.en b/doc/language_issues.en index 348ca2c3d7..6dcf03929b 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -177,13 +177,11 @@ WARNING: untranslated string: advproxy RADIUS unauthorized users = Unauthorized WARNING: untranslated string: advproxy RADIUS use negative access list = Use negative access control WARNING: untranslated string: advproxy RADIUS use positive access list = Use positive access control WARNING: untranslated string: advproxy RADIUS user based access restrictions = User based access restrictions -WARNING: untranslated string: advproxy UA enable filter = Enable browser check WARNING: untranslated string: advproxy access = Access WARNING: untranslated string: advproxy admin mail = Cache administrator e-mail WARNING: untranslated string: advproxy advanced web proxy = Advanced Web Proxy WARNING: untranslated string: advproxy advanced web proxy configuration = Advanced web proxy configuration WARNING: untranslated string: advproxy allowed subnets = Allowed subnets (one per line) -WARNING: untranslated string: advproxy allowed web browsers = Allowed clients for web access WARNING: untranslated string: advproxy back to main page = Back to main page WARNING: untranslated string: advproxy banned ip clients = Banned IP addresses (one per line) WARNING: untranslated string: advproxy banned mac clients = Banned MAC addresses (one per line) @@ -195,7 +193,6 @@ WARNING: untranslated string: advproxy classroom extensions = Classroom extensio WARNING: untranslated string: advproxy clear cache = Clear Cache WARNING: untranslated string: advproxy client IP forwarding = Client IP address forwarding WARNING: untranslated string: advproxy common settings = Common settings -WARNING: untranslated string: advproxy content based throttling = Enable content based throttling WARNING: untranslated string: advproxy cre disabled = The management interface has been disabled by the administrator WARNING: untranslated string: advproxy cre group definitions = Classroom group definitions WARNING: untranslated string: advproxy cre supervisors = Supervisor IP addresses (one per line) @@ -222,7 +219,6 @@ WARNING: untranslated string: advproxy errmsg ldap port = Invalid LDAP port numb WARNING: untranslated string: advproxy errmsg ldap server = Invalid IP address/hostname for LDAP Server WARNING: untranslated string: advproxy errmsg max userip = Invalid number of IP addresses per user WARNING: untranslated string: advproxy errmsg mem cache size = Invalid value for memory cache size -WARNING: untranslated string: advproxy errmsg no browser = At least one browser or client must be selected for web access WARNING: untranslated string: advproxy errmsg no username = Username can not be empty WARNING: untranslated string: advproxy errmsg non-transparent proxy required = Web proxy must be running in non-transparent mode for authentication WARNING: untranslated string: advproxy errmsg password length = Invalid value for password length @@ -257,7 +253,6 @@ WARNING: untranslated string: advproxy mode deny = deny WARNING: untranslated string: advproxy monday = Mon WARNING: untranslated string: advproxy network based access = Network based access control WARNING: untranslated string: advproxy no cache sites = Do not cache these domains (one per line) -WARNING: untranslated string: advproxy no clients defined = No clients defined WARNING: untranslated string: advproxy no connection auth = No connection oriented authentication forwarding WARNING: untranslated string: advproxy no cre groups = There are no access groups available WARNING: untranslated string: advproxy no internal proxy on blue = Disable internal proxy access from BLUE to other subnets @@ -281,9 +276,6 @@ WARNING: untranslated string: advproxy standard ports = Allowed standard ports ( WARNING: untranslated string: advproxy sunday = Sun WARNING: untranslated string: advproxy supervisor password = Supervisor password WARNING: untranslated string: advproxy suppress version = Suppress version information -WARNING: untranslated string: advproxy throttle binary = Binary files -WARNING: untranslated string: advproxy throttle dskimg = CD images -WARNING: untranslated string: advproxy throttle mmedia = Multimedia WARNING: untranslated string: advproxy throttling per host on = Limit per host on WARNING: untranslated string: advproxy throttling total on = Overall limit on WARNING: untranslated string: advproxy throttling unlimited = unlimited @@ -305,7 +297,6 @@ WARNING: untranslated string: advproxy url filter = URL filter WARNING: untranslated string: advproxy username forwarding = Username forwarding WARNING: untranslated string: advproxy via forwarding = Proxy address forwarding WARNING: untranslated string: advproxy visible hostname = Visible hostname -WARNING: untranslated string: advproxy web browser = Web browser WARNING: untranslated string: advproxy wednesday = Wed WARNING: untranslated string: age second = second WARNING: untranslated string: aktiv = Active diff --git a/doc/language_issues.es b/doc/language_issues.es index f702b2a1f7..6485fccbce 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -36,7 +36,9 @@ WARNING: translation string unused: advproxy NTLM use integrated auth WARNING: translation string unused: advproxy NTLM use negative access list WARNING: translation string unused: advproxy NTLM use positive access list WARNING: translation string unused: advproxy NTLM user based access restrictions +WARNING: translation string unused: advproxy UA enable filter WARNING: translation string unused: advproxy advanced proxy +WARNING: translation string unused: advproxy allowed web browsers WARNING: translation string unused: advproxy chgwebpwd ERROR WARNING: translation string unused: advproxy chgwebpwd SUCCESS WARNING: translation string unused: advproxy chgwebpwd change password @@ -45,21 +47,28 @@ WARNING: translation string unused: advproxy chgwebpwd new password WARNING: translation string unused: advproxy chgwebpwd new password confirm WARNING: translation string unused: advproxy chgwebpwd old password WARNING: translation string unused: advproxy chgwebpwd username +WARNING: translation string unused: advproxy content based throttling WARNING: translation string unused: advproxy errmsg auth ipcache ttl WARNING: translation string unused: advproxy errmsg change fail WARNING: translation string unused: advproxy errmsg change success WARNING: translation string unused: advproxy errmsg invalid bdc WARNING: translation string unused: advproxy errmsg invalid pdc WARNING: translation string unused: advproxy errmsg invalid user +WARNING: translation string unused: advproxy errmsg no browser WARNING: translation string unused: advproxy errmsg no password WARNING: translation string unused: advproxy errmsg ntlm domain WARNING: translation string unused: advproxy errmsg ntlm pdc WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy invalid num of children +WARNING: translation string unused: advproxy no clients defined WARNING: translation string unused: advproxy redirector children WARNING: translation string unused: advproxy ssadvanced proxy +WARNING: translation string unused: advproxy throttle binary +WARNING: translation string unused: advproxy throttle dskimg +WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: advproxy web browser WARNING: translation string unused: again WARNING: translation string unused: alcatelusb help WARNING: translation string unused: alcatelusb upload diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 5fd9877610..06f5a0f55b 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -60,7 +60,9 @@ WARNING: translation string unused: advproxy NTLM use integrated auth WARNING: translation string unused: advproxy NTLM use negative access list WARNING: translation string unused: advproxy NTLM use positive access list WARNING: translation string unused: advproxy NTLM user based access restrictions +WARNING: translation string unused: advproxy UA enable filter WARNING: translation string unused: advproxy advanced proxy +WARNING: translation string unused: advproxy allowed web browsers WARNING: translation string unused: advproxy chgwebpwd ERROR WARNING: translation string unused: advproxy chgwebpwd SUCCESS WARNING: translation string unused: advproxy chgwebpwd change password @@ -69,21 +71,28 @@ WARNING: translation string unused: advproxy chgwebpwd new password WARNING: translation string unused: advproxy chgwebpwd new password confirm WARNING: translation string unused: advproxy chgwebpwd old password WARNING: translation string unused: advproxy chgwebpwd username +WARNING: translation string unused: advproxy content based throttling WARNING: translation string unused: advproxy errmsg auth ipcache ttl WARNING: translation string unused: advproxy errmsg change fail WARNING: translation string unused: advproxy errmsg change success WARNING: translation string unused: advproxy errmsg invalid bdc WARNING: translation string unused: advproxy errmsg invalid pdc WARNING: translation string unused: advproxy errmsg invalid user +WARNING: translation string unused: advproxy errmsg no browser WARNING: translation string unused: advproxy errmsg no password WARNING: translation string unused: advproxy errmsg ntlm domain WARNING: translation string unused: advproxy errmsg ntlm pdc WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy invalid num of children +WARNING: translation string unused: advproxy no clients defined WARNING: translation string unused: advproxy redirector children WARNING: translation string unused: advproxy ssadvanced proxy +WARNING: translation string unused: advproxy throttle binary +WARNING: translation string unused: advproxy throttle dskimg +WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: advproxy web browser WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_issues.it b/doc/language_issues.it index d80d124547..ba746410a7 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -38,7 +38,9 @@ WARNING: translation string unused: advproxy NTLM use integrated auth WARNING: translation string unused: advproxy NTLM use negative access list WARNING: translation string unused: advproxy NTLM use positive access list WARNING: translation string unused: advproxy NTLM user based access restrictions +WARNING: translation string unused: advproxy UA enable filter WARNING: translation string unused: advproxy advanced proxy +WARNING: translation string unused: advproxy allowed web browsers WARNING: translation string unused: advproxy chgwebpwd ERROR WARNING: translation string unused: advproxy chgwebpwd SUCCESS WARNING: translation string unused: advproxy chgwebpwd change password @@ -47,21 +49,28 @@ WARNING: translation string unused: advproxy chgwebpwd new password WARNING: translation string unused: advproxy chgwebpwd new password confirm WARNING: translation string unused: advproxy chgwebpwd old password WARNING: translation string unused: advproxy chgwebpwd username +WARNING: translation string unused: advproxy content based throttling WARNING: translation string unused: advproxy errmsg auth ipcache ttl WARNING: translation string unused: advproxy errmsg change fail WARNING: translation string unused: advproxy errmsg change success WARNING: translation string unused: advproxy errmsg invalid bdc WARNING: translation string unused: advproxy errmsg invalid pdc WARNING: translation string unused: advproxy errmsg invalid user +WARNING: translation string unused: advproxy errmsg no browser WARNING: translation string unused: advproxy errmsg no password WARNING: translation string unused: advproxy errmsg ntlm domain WARNING: translation string unused: advproxy errmsg ntlm pdc WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy invalid num of children +WARNING: translation string unused: advproxy no clients defined WARNING: translation string unused: advproxy redirector children WARNING: translation string unused: advproxy ssadvanced proxy +WARNING: translation string unused: advproxy throttle binary +WARNING: translation string unused: advproxy throttle dskimg +WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: advproxy web browser WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_issues.nl b/doc/language_issues.nl index c8bf1c49ff..883c6ba027 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -37,7 +37,9 @@ WARNING: translation string unused: advproxy NTLM use integrated auth WARNING: translation string unused: advproxy NTLM use negative access list WARNING: translation string unused: advproxy NTLM use positive access list WARNING: translation string unused: advproxy NTLM user based access restrictions +WARNING: translation string unused: advproxy UA enable filter WARNING: translation string unused: advproxy advanced proxy +WARNING: translation string unused: advproxy allowed web browsers WARNING: translation string unused: advproxy chgwebpwd ERROR WARNING: translation string unused: advproxy chgwebpwd SUCCESS WARNING: translation string unused: advproxy chgwebpwd change password @@ -46,21 +48,28 @@ WARNING: translation string unused: advproxy chgwebpwd new password WARNING: translation string unused: advproxy chgwebpwd new password confirm WARNING: translation string unused: advproxy chgwebpwd old password WARNING: translation string unused: advproxy chgwebpwd username +WARNING: translation string unused: advproxy content based throttling WARNING: translation string unused: advproxy errmsg auth ipcache ttl WARNING: translation string unused: advproxy errmsg change fail WARNING: translation string unused: advproxy errmsg change success WARNING: translation string unused: advproxy errmsg invalid bdc WARNING: translation string unused: advproxy errmsg invalid pdc WARNING: translation string unused: advproxy errmsg invalid user +WARNING: translation string unused: advproxy errmsg no browser WARNING: translation string unused: advproxy errmsg no password WARNING: translation string unused: advproxy errmsg ntlm domain WARNING: translation string unused: advproxy errmsg ntlm pdc WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy invalid num of children +WARNING: translation string unused: advproxy no clients defined WARNING: translation string unused: advproxy redirector children WARNING: translation string unused: advproxy ssadvanced proxy +WARNING: translation string unused: advproxy throttle binary +WARNING: translation string unused: advproxy throttle dskimg +WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: advproxy web browser WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/doc/language_issues.pl b/doc/language_issues.pl index f702b2a1f7..6485fccbce 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -36,7 +36,9 @@ WARNING: translation string unused: advproxy NTLM use integrated auth WARNING: translation string unused: advproxy NTLM use negative access list WARNING: translation string unused: advproxy NTLM use positive access list WARNING: translation string unused: advproxy NTLM user based access restrictions +WARNING: translation string unused: advproxy UA enable filter WARNING: translation string unused: advproxy advanced proxy +WARNING: translation string unused: advproxy allowed web browsers WARNING: translation string unused: advproxy chgwebpwd ERROR WARNING: translation string unused: advproxy chgwebpwd SUCCESS WARNING: translation string unused: advproxy chgwebpwd change password @@ -45,21 +47,28 @@ WARNING: translation string unused: advproxy chgwebpwd new password WARNING: translation string unused: advproxy chgwebpwd new password confirm WARNING: translation string unused: advproxy chgwebpwd old password WARNING: translation string unused: advproxy chgwebpwd username +WARNING: translation string unused: advproxy content based throttling WARNING: translation string unused: advproxy errmsg auth ipcache ttl WARNING: translation string unused: advproxy errmsg change fail WARNING: translation string unused: advproxy errmsg change success WARNING: translation string unused: advproxy errmsg invalid bdc WARNING: translation string unused: advproxy errmsg invalid pdc WARNING: translation string unused: advproxy errmsg invalid user +WARNING: translation string unused: advproxy errmsg no browser WARNING: translation string unused: advproxy errmsg no password WARNING: translation string unused: advproxy errmsg ntlm domain WARNING: translation string unused: advproxy errmsg ntlm pdc WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy invalid num of children +WARNING: translation string unused: advproxy no clients defined WARNING: translation string unused: advproxy redirector children WARNING: translation string unused: advproxy ssadvanced proxy +WARNING: translation string unused: advproxy throttle binary +WARNING: translation string unused: advproxy throttle dskimg +WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: advproxy web browser WARNING: translation string unused: again WARNING: translation string unused: alcatelusb help WARNING: translation string unused: alcatelusb upload diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 0500b0e199..88ba126a10 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -37,7 +37,9 @@ WARNING: translation string unused: advproxy NTLM use integrated auth WARNING: translation string unused: advproxy NTLM use negative access list WARNING: translation string unused: advproxy NTLM use positive access list WARNING: translation string unused: advproxy NTLM user based access restrictions +WARNING: translation string unused: advproxy UA enable filter WARNING: translation string unused: advproxy advanced proxy +WARNING: translation string unused: advproxy allowed web browsers WARNING: translation string unused: advproxy chgwebpwd ERROR WARNING: translation string unused: advproxy chgwebpwd SUCCESS WARNING: translation string unused: advproxy chgwebpwd change password @@ -46,21 +48,28 @@ WARNING: translation string unused: advproxy chgwebpwd new password WARNING: translation string unused: advproxy chgwebpwd new password confirm WARNING: translation string unused: advproxy chgwebpwd old password WARNING: translation string unused: advproxy chgwebpwd username +WARNING: translation string unused: advproxy content based throttling WARNING: translation string unused: advproxy errmsg auth ipcache ttl WARNING: translation string unused: advproxy errmsg change fail WARNING: translation string unused: advproxy errmsg change success WARNING: translation string unused: advproxy errmsg invalid bdc WARNING: translation string unused: advproxy errmsg invalid pdc WARNING: translation string unused: advproxy errmsg invalid user +WARNING: translation string unused: advproxy errmsg no browser WARNING: translation string unused: advproxy errmsg no password WARNING: translation string unused: advproxy errmsg ntlm domain WARNING: translation string unused: advproxy errmsg ntlm pdc WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy invalid num of children +WARNING: translation string unused: advproxy no clients defined WARNING: translation string unused: advproxy redirector children WARNING: translation string unused: advproxy ssadvanced proxy +WARNING: translation string unused: advproxy throttle binary +WARNING: translation string unused: advproxy throttle dskimg +WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: advproxy web browser WARNING: translation string unused: again WARNING: translation string unused: alcatelusb help WARNING: translation string unused: alcatelusb upload diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 8d0ae25e1c..f4aca5b7eb 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -60,7 +60,9 @@ WARNING: translation string unused: advproxy NTLM use integrated auth WARNING: translation string unused: advproxy NTLM use negative access list WARNING: translation string unused: advproxy NTLM use positive access list WARNING: translation string unused: advproxy NTLM user based access restrictions +WARNING: translation string unused: advproxy UA enable filter WARNING: translation string unused: advproxy advanced proxy +WARNING: translation string unused: advproxy allowed web browsers WARNING: translation string unused: advproxy chgwebpwd ERROR WARNING: translation string unused: advproxy chgwebpwd SUCCESS WARNING: translation string unused: advproxy chgwebpwd change password @@ -69,21 +71,28 @@ WARNING: translation string unused: advproxy chgwebpwd new password WARNING: translation string unused: advproxy chgwebpwd new password confirm WARNING: translation string unused: advproxy chgwebpwd old password WARNING: translation string unused: advproxy chgwebpwd username +WARNING: translation string unused: advproxy content based throttling WARNING: translation string unused: advproxy errmsg auth ipcache ttl WARNING: translation string unused: advproxy errmsg change fail WARNING: translation string unused: advproxy errmsg change success WARNING: translation string unused: advproxy errmsg invalid bdc WARNING: translation string unused: advproxy errmsg invalid pdc WARNING: translation string unused: advproxy errmsg invalid user +WARNING: translation string unused: advproxy errmsg no browser WARNING: translation string unused: advproxy errmsg no password WARNING: translation string unused: advproxy errmsg ntlm domain WARNING: translation string unused: advproxy errmsg ntlm pdc WARNING: translation string unused: advproxy errmsg password incorrect WARNING: translation string unused: advproxy invalid num of children +WARNING: translation string unused: advproxy no clients defined WARNING: translation string unused: advproxy redirector children WARNING: translation string unused: advproxy ssadvanced proxy +WARNING: translation string unused: advproxy throttle binary +WARNING: translation string unused: advproxy throttle dskimg +WARNING: translation string unused: advproxy throttle mmedia WARNING: translation string unused: advproxy update information WARNING: translation string unused: advproxy update notification +WARNING: translation string unused: advproxy web browser WARNING: translation string unused: again WARNING: translation string unused: age seconds WARNING: translation string unused: age shour diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 7b442e1043..09e6b33a15 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -57,9 +57,6 @@ my %checked=(); my %selected=(); my @throttle_limits=(64,128,256,384,512,768,1024,1280,1536,1792,2048,2560,3072,3584,4096,5120,6144,7168,8192,10240,12288,16384,20480); -my $throttle_binary="7z|arj|bin|bz2|cab|exe|gz|lzh|rar|sea|tar|tgz|xz|zip"; -my $throttle_dskimg="b5t|bin|bwt|ccd|cdi|cue|gho|img|iso|mds|nrg|pqi|vmdk"; -my $throttle_mmedia="aiff?|asf|avi|divx|mov|mp3|mpe?g|ogg|qt|ra?m|ts|vob"; my $def_ports_safe="80 # http\n21 # ftp\n443 # https\n563 # snews\n70 # gopher\n210 # wais\n1025-65535 # unregistered ports\n280 # http-mgmt\n488 # gss-http\n591 # filemaker\n777 # multiling http\n800 # Squids port (for icons)\n"; my $def_ports_ssl="443 # https\n563 # snews\n"; @@ -230,9 +227,6 @@ $proxysettings{'THROTTLING_GREEN_TOTAL'} = 'unlimited'; $proxysettings{'THROTTLING_GREEN_HOST'} = 'unlimited'; $proxysettings{'THROTTLING_BLUE_TOTAL'} = 'unlimited'; $proxysettings{'THROTTLING_BLUE_HOST'} = 'unlimited'; -$proxysettings{'THROTTLE_BINARY'} = 'off'; -$proxysettings{'THROTTLE_DSKIMG'} = 'off'; -$proxysettings{'THROTTLE_MMEDIA'} = 'off'; $proxysettings{'ENABLE_MIME_FILTER'} = 'off'; $proxysettings{'FAKE_USERAGENT'} = ''; $proxysettings{'FAKE_REFERER'} = ''; @@ -767,16 +761,6 @@ $selected{'THROTTLING_GREEN_HOST'}{$proxysettings{'THROTTLING_GREEN_HOST'}} = "s $selected{'THROTTLING_BLUE_TOTAL'}{$proxysettings{'THROTTLING_BLUE_TOTAL'}} = "selected='selected'"; $selected{'THROTTLING_BLUE_HOST'}{$proxysettings{'THROTTLING_BLUE_HOST'}} = "selected='selected'"; -$checked{'THROTTLE_BINARY'}{'off'} = ''; -$checked{'THROTTLE_BINARY'}{'on'} = ''; -$checked{'THROTTLE_BINARY'}{$proxysettings{'THROTTLE_BINARY'}} = "checked='checked'"; -$checked{'THROTTLE_DSKIMG'}{'off'} = ''; -$checked{'THROTTLE_DSKIMG'}{'on'} = ''; -$checked{'THROTTLE_DSKIMG'}{$proxysettings{'THROTTLE_DSKIMG'}} = "checked='checked'"; -$checked{'THROTTLE_MMEDIA'}{'off'} = ''; -$checked{'THROTTLE_MMEDIA'}{'on'} = ''; -$checked{'THROTTLE_MMEDIA'}{$proxysettings{'THROTTLE_MMEDIA'}} = "checked='checked'"; - $checked{'ENABLE_MIME_FILTER'}{'off'} = ''; $checked{'ENABLE_MIME_FILTER'}{'on'} = ''; $checked{'ENABLE_MIME_FILTER'}{$proxysettings{'ENABLE_MIME_FILTER'}} = "checked='checked'"; @@ -1509,21 +1493,6 @@ END print < - - - - - - - - - - - - - - -
$Lang::tr{'advproxy content based throttling'}:
$Lang::tr{'advproxy throttle binary'}:$Lang::tr{'advproxy throttle dskimg'}:$Lang::tr{'advproxy throttle mmedia'}:  
@@ -2707,23 +2676,6 @@ sub write_acls if (!$proxysettings{'PORTS_SSL'}) { print FILE $def_ports_ssl; } else { print FILE $proxysettings{'PORTS_SSL'}; } close(FILE); - open(FILE, ">$acl_dst_throttle"); - flock(FILE, 2); - if ($proxysettings{'THROTTLE_BINARY'} eq 'on') - { - @temp = split(/\|/,$throttle_binary); - foreach (@temp) { print FILE "\\.$_\$\n"; } - } - if ($proxysettings{'THROTTLE_DSKIMG'} eq 'on') - { - @temp = split(/\|/,$throttle_dskimg); - foreach (@temp) { print FILE "\\.$_\$\n"; } - } - if ($proxysettings{'THROTTLE_MMEDIA'} eq 'on') - { - @temp = split(/\|/,$throttle_mmedia); - foreach (@temp) { print FILE "\\.$_\$\n"; } - } if (-s $throttled_urls) { open(URLFILE, $throttled_urls); -- 2.39.2