Fixed Proxy unable to handle max download size correct. Added and started to core 45.

diff --git a/config/rootfiles/core/45/exclude b/config/rootfiles/core/45/exclude
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files
new file mode 100644 (file)
index 0000000..d3c27e8
--- /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 (file)
index 0000000..d547fa8
--- /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 (file)
index 0000000..40d08d4
--- /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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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 2525b6e2f60c241aaad619168f2b4059e34499db..f732c5b68c96add3abd9b0b2d9cadc7c2fa969f9 100644 (file)
--- 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";