From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 d5a7ff9500d4a206bc9780c2deab54e96c7c3f79
Date: Thu, 10 Jan 2013 16:41:27 +0100
Message-ID: <20130110154128.58450200D9@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0432522847686831440=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============0432522847686831440==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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  d5a7ff9500d4a206bc9780c2deab54e96c7c3f79 (commit)
      from  f0ccae18190edf6c4b1041c5aff91a01b4ddffb3 (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 d5a7ff9500d4a206bc9780c2deab54e96c7c3f79
Author: Alexander Marx <amarx(a)ipfire.org>
Date:   Thu Jan 10 16:39:58 2013 +0100

    Squid: added check if ram cache is greater than harddisk cache

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

Summary of changes:
 html/cgi-bin/proxy.cgi | 5 +++++
 langs/de/cgi-bin/de.pl | 1 +
 langs/en/cgi-bin/en.pl | 1 +
 3 files changed, 7 insertions(+)

Difference in files:
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 015502a..991d691 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -348,6 +348,11 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || (=
$proxysettings{'ACTION'}
 		$errormessage =3D $Lang::tr{'invalid input'};
 		goto ERROR;
 	}
+	if($proxysettings{'CACHE_MEM'} > $proxysettings{'CACHE_SIZE'}){
+		$errormessage =3D $Lang::tr{'advproxy errmsg cache'}." ".$proxysettings{'C=
ACHE_MEM'}." > ".$proxysettings{'CACHE_SIZE'};
+		goto ERROR;
+	}
+=09
 	if (!(&General::validport($proxysettings{'PROXY_PORT'})))
 	{
 		$errormessage =3D $Lang::tr{'advproxy errmsg invalid proxy port'};
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ca5dbb3..9c3d281 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -212,6 +212,7 @@
 'advproxy errmsg auth children' =3D> 'Ung=C3=BCltige Anzahl Authentifizierun=
gsprozesse',
 'advproxy errmsg auth ipcache may not be null' =3D> 'Authentifizierungscache=
 TTL darf nicht 0 sein wenn IP-Adressbeschr=C3=A4nkungen verwendet werden',
 'advproxy errmsg auth ipcache ttl' =3D> 'Ung=C3=BCltiger Wert f=C3=BCr Benut=
zer/IP-Cache TTL',
+'advproxy errmsg cache' =3D> 'Der RAM-Cache-Gr=C3=B6=C3=9Fe ist gr=C3=B6=C3=
=9Fer als die Festplatten-Cache-Gr=C3=B6=C3=9Fe:',
 'advproxy errmsg change fail' =3D> 'Passwort konnte nicht ge=C3=A4ndert werd=
en',
 'advproxy errmsg change success' =3D> 'Passwort f=C3=BCr Webzugriff erfolgre=
ich ge=C3=A4ndert',
 'advproxy errmsg hdd cache size' =3D> 'Ung=C3=BCltiger Wert f=C3=BCr die Gr=
=C3=B6=C3=9Fe des Festplatten-Cachespeichers (min. 10 MB erforderlich)',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ede4517..23df6bd 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -212,6 +212,7 @@
 'advproxy errmsg auth children' =3D> 'Invalid number of authentication proce=
sses',
 'advproxy errmsg auth ipcache may not be null' =3D> 'Authentication cache TT=
L may not be 0 when using IP address limits',
 'advproxy errmsg auth ipcache ttl' =3D> 'Invalid value for user/IP cache TTL=
',
+'advproxy errmsg cache' =3D> 'The RAM cache size is greater than the harddis=
k cache size:',
 'advproxy errmsg change fail' =3D> 'Password could not be changed',
 'advproxy errmsg change success' =3D> 'Password for web access sucessfully c=
hanged',
 'advproxy errmsg hdd cache size' =3D> 'Invalid value for harddisk cache size=
 (min 10 MB required)',


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

--===============0432522847686831440==--