X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fproxy.cgi;fp=html%2Fcgi-bin%2Fproxy.cgi;h=9c3be0b054446066331b13c2d039c28ed860306a;hp=03fd1ab7b6d18513e4e1078a6162bc998dc18de4;hb=f0b7534f7f7b853f993bcb9e5b3f717167df416e;hpb=3ebc0da70f7237f8892884d96bf9fc5b9a06304a diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 03fd1ab7b..9c3be0b05 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3169,9 +3169,35 @@ END print FILE "\n"; } - if ($proxysettings{'CACHE_SIZE'} ne '0') + if ($proxysettings{'CACHE_SIZE'} > 0) { + print FILE < 0) { + if (!-z $acl_src_unrestricted_ip) { print FILE "reply_body_max_size none IPFire_unrestricted_ips\n"; } + if (!-z $acl_src_unrestricted_mac) { print FILE "reply_body_max_size none IPFire_unrestricted_mac\n"; } + if ($proxysettings{'AUTH_METHOD'} eq 'ncsa') + { + if (!-z $extgrp) { print FILE "reply_body_max_size none for_extended_users\n"; } + } + } + + if ( $proxysettings{'MAX_INCOMING_SIZE'} != '0' ) { - print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n"; + print FILE "reply_body_max_size $proxysettings{'MAX_INCOMING_SIZE'} KB all\n\n"; } if ($proxysettings{'LOGGING'} eq 'on') @@ -3951,34 +3977,6 @@ END print FILE "http_reply_access allow all\n\n"; } - if ($proxysettings{'CACHE_SIZE'} > 0) - { - print FILE < 0) { - if (!-z $acl_src_unrestricted_ip) { print FILE "reply_body_max_size none IPFire_unrestricted_ips\n"; } - if (!-z $acl_src_unrestricted_mac) { print FILE "reply_body_max_size none IPFire_unrestricted_mac\n"; } - if ($proxysettings{'AUTH_METHOD'} eq 'ncsa') - { - if (!-z $extgrp) { print FILE "reply_body_max_size none for_extended_users\n"; } - } - } - - if ( $proxysettings{'MAX_INCOMING_SIZE'} != '0' ) - { - print FILE "reply_body_max_size $proxysettings{'MAX_INCOMING_SIZE'} KB all\n\n"; - } - print FILE "visible_hostname"; if ($proxysettings{'VISIBLE_HOSTNAME'} eq '') {