From 512d54a98f02dbed4bd67c73dad0c318d8831f8c Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Tue, 18 Jan 2011 19:20:48 +0100 Subject: [PATCH] Fixed Proxy unable to handle max download size correct. Added and started to core 45. --- config/rootfiles/core/45/exclude | 0 config/rootfiles/core/45/filelists/files | 3 ++ config/rootfiles/core/45/meta | 1 + config/rootfiles/core/45/update.sh | 49 ++++++++++++++++++++++++ html/cgi-bin/proxy.cgi | 12 +++--- 5 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 config/rootfiles/core/45/exclude create mode 100644 config/rootfiles/core/45/filelists/files create mode 100644 config/rootfiles/core/45/meta create mode 100644 config/rootfiles/core/45/update.sh diff --git a/config/rootfiles/core/45/exclude b/config/rootfiles/core/45/exclude new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files new file mode 100644 index 0000000000..d3c27e8a1c --- /dev/null +++ b/config/rootfiles/core/45/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/config/rootfiles/core/45/meta b/config/rootfiles/core/45/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/45/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/45/update.sh b/config/rootfiles/core/45/update.sh new file mode 100644 index 0000000000..40d08d4381 --- /dev/null +++ b/config/rootfiles/core/45/update.sh @@ -0,0 +1,49 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire +#depmod 2.6.32.28-ipfire-pae +#depmod 2.6.32.28-ipfire-xen + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 2525b6e2f6..f732c5b68c 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -82,7 +82,6 @@ my @templist=(); my $cachemem=0; my $proxy1=''; my $proxy2=''; -my $replybodymaxsize=0; my $browser_regexp=''; my $needhup = 0; my $errormessage=''; @@ -3870,19 +3869,18 @@ END request_body_max_size $proxysettings{'MAX_OUTGOING_SIZE'} KB END ; - $replybodymaxsize = 1024 * $proxysettings{'MAX_INCOMING_SIZE'}; if ($proxysettings{'MAX_INCOMING_SIZE'} > 0) { - if (!-z $acl_src_unrestricted_ip) { print FILE "reply_body_max_size 0 deny IPFire_unrestricted_ips\n"; } - if (!-z $acl_src_unrestricted_mac) { print FILE "reply_body_max_size 0 deny IPFire_unrestricted_mac\n"; } + 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 0 deny for_extended_users\n"; } + if (!-z $extgrp) { print FILE "reply_body_max_size none for_extended_users\n"; } } } - if ( $replybodymaxsize != '0' ) + if ( $proxysettings{'MAX_INCOMING_SIZE'} != '0' ) { - print FILE "reply_body_max_size $replybodymaxsize deny all\n\n"; + print FILE "reply_body_max_size $proxysettings{'MAX_INCOMING_SIZE'} KB all\n\n"; } print FILE "visible_hostname"; -- 2.39.2