[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e7b7cbae360dc4406e14faddd4cd1d1dac0495b2

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e7b7cbae360dc4406e14faddd4cd1d1dac0495b2

[git]

[-- Attachment #1: Type: text/plain, Size: 1995 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  e7b7cbae360dc4406e14faddd4cd1d1dac0495b2 (commit)
      from  1cab447f8fbf0aa35af9d65a1c44885a5dd12eec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e7b7cbae360dc4406e14faddd4cd1d1dac0495b2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Jan 13 22:46:49 2013 +0100

    proxy: fix cache_replacement_policy setting.
    
    fixes: 10264
    thx to SAHC for help.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/proxy.cgi | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 991d691..c3997cf 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3086,12 +3086,6 @@ pid_filename /var/run/squid.pid
 cache_mem $proxysettings{'CACHE_MEM'} MB
 END
 	;
-
-	if ($proxysettings{'CACHE_SIZE'} ne '0')
-	{
-		print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n";
-	}
-
 	print FILE "error_directory $errordir/$proxysettings{'ERR_LANGUAGE'}\n\n";
 
 	if ($proxysettings{'OFFLINE_MODE'} eq 'on') {  print FILE "offline_mode on\n\n"; }
@@ -3109,6 +3103,11 @@ END
 		print FILE "\n";
 	}
 
+	if ($proxysettings{'CACHE_SIZE'} ne '0')
+	{
+		print FILE "cache_dir aufs /var/log/cache $proxysettings{'CACHE_SIZE'} $proxysettings{'L1_DIRS'} 256\n\n";
+	}
+
 	if ($proxysettings{'LOGGING'} eq 'on')
 	{
 		print FILE <<END


hooks/post-receive
--
IPFire 2.x development tree