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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 1704 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  8b6f424c03c527ecfbd7445d5e7553e767d65ca9 (commit)
      from  7f39519efeeb2b87fa06d31b2e52010183a4ad09 (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 8b6f424c03c527ecfbd7445d5e7553e767d65ca9
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Wed Jan 16 20:38:35 2013 +0100

    SQUID : BUG 10280: extended patch, so that 0 is a valid value for disk-cache

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

Summary of changes:
 html/cgi-bin/proxy.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Difference in files:
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index c3997cf..b217de3 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -348,7 +348,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
 		$errormessage = $Lang::tr{'invalid input'};
 		goto ERROR;
 	}
-	if($proxysettings{'CACHE_MEM'} > $proxysettings{'CACHE_SIZE'}){
+	if($proxysettings{'CACHE_MEM'} > $proxysettings{'CACHE_SIZE'} && $proxysettings{'CACHE_SIZE'} > 0){
 		$errormessage = $Lang::tr{'advproxy errmsg cache'}." ".$proxysettings{'CACHE_MEM'}." > ".$proxysettings{'CACHE_SIZE'};
 		goto ERROR;
 	}


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