public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8b6f424c03c527ecfbd7445d5e7553e767d65ca9
Date: Sun, 20 Jan 2013 17:07:09 +0100	[thread overview]
Message-ID: <20130120160709.8DF5120210@argus.ipfire.org> (raw)

[-- 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

                 reply	other threads:[~2013-01-20 16:07 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130120160709.8DF5120210@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox