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 6bea848d3476dd042d0a4f0f9eca63f7773e503c (commit) from 812a8f120e523b409a39e360342f5bc09742d116 (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 6bea848d3476dd042d0a4f0f9eca63f7773e503c Author: Jan Behrens jan.behrensx@gmail.com Date: Fri Mar 1 00:03:20 2013 +0100

squid: Compile with --enable-cache-digests.

Bug #10311 https://bugzilla.ipfire.org/show_bug.cgi?id=10311

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

Summary of changes: doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_missings | 4 ++++ html/cgi-bin/proxy.cgi | 11 ++++++++++- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + lfs/squid | 2 +- 10 files changed, 22 insertions(+), 2 deletions(-)

Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index 78a0222..2468981 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -506,6 +506,7 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: attention diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 4c18528..70dbdc1 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -505,6 +505,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: attention diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 5a23c69..f17d07d 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -507,6 +507,7 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: new diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 78a0222..2468981 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -506,6 +506,7 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: attention diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 0196084..d59f4f6 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -497,6 +497,7 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: attention diff --git a/doc/language_missings b/doc/language_missings index a4eebcd..ac650b3 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -11,6 +11,7 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ +< advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy < attention @@ -134,6 +135,7 @@ ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ +< advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy < Async logging enabled @@ -250,6 +252,7 @@ ############################################################################ # Checking cgi-bin translations for language: pl # ############################################################################ +< advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy < attention @@ -342,6 +345,7 @@ # Checking cgi-bin translations for language: ru # ############################################################################ < Add a route +< advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy < attention diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index cc7416a..901ed72 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -221,6 +221,7 @@ $proxysettings{'MEM_POLICY'} = 'LRU'; $proxysettings{'CACHE_POLICY'} = 'LRU'; $proxysettings{'L1_DIRS'} = '16'; $proxysettings{'OFFLINE_MODE'} = 'off'; +$proxysettings{'CACHE_DIGESTS'} = 'off'; $proxysettings{'CLASSROOM_EXT'} = 'off'; $proxysettings{'SUPERVISOR_PASSWORD'} = ''; $proxysettings{'NO_PROXY_LOCAL'} = 'off'; @@ -737,6 +738,9 @@ $selected{'L1_DIRS'}{$proxysettings{'L1_DIRS'}} = "selected='selected'"; $checked{'OFFLINE_MODE'}{'off'} = ''; $checked{'OFFLINE_MODE'}{'on'} = ''; $checked{'OFFLINE_MODE'}{$proxysettings{'OFFLINE_MODE'}} = "checked='checked'"; +$checked{'CACHE_DIGESTS'}{'off'} = ''; +$checked{'CACHE_DIGESTS'}{'on'} = ''; +$checked{'CACHE_DIGESTS'}{$proxysettings{'CACHE_DIGESTS'}} = "checked='checked'";

$checked{'LOGGING'}{'off'} = ''; $checked{'LOGGING'}{'on'} = ''; @@ -1170,6 +1174,10 @@ print <<END <td class='base'>$Lang::tr{'advproxy offline mode'}:</td> <td><input type='checkbox' name='OFFLINE_MODE' $checked{'OFFLINE_MODE'}{'on'} /></td> </tr> +<tr> + <td class='base'>$Lang::tr{'advproxy cache-digest'}:</td> + <td><input type='checkbox' name='CACHE_DIGESTS' $checked{'CACHE_DIGESTS'}{'on'} /></td> +</tr> </table> <hr size='1'> <table width='100%'> @@ -3097,7 +3105,8 @@ END print FILE "error_directory $errordir/$proxysettings{'ERR_LANGUAGE'}\n\n";

if ($proxysettings{'OFFLINE_MODE'} eq 'on') { print FILE "offline_mode on\n\n"; } - + if ($proxysettings{'CACHE_DIGESTS'} eq 'on') { print FILE "digest_generation on\n\n"; } else { print FILE "digest_generation off\n\n"; } + if ((!($proxysettings{'MEM_POLICY'} eq 'LRU')) || (!($proxysettings{'CACHE_POLICY'} eq 'LRU'))) { if (!($proxysettings{'MEM_POLICY'} eq 'LRU')) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index f9405d7..03f9a42 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -187,6 +187,7 @@ 'advproxy banned mac clients' => 'Gesperrte MAC-Adressen (eine pro Zeile)', 'advproxy cache management' => 'Cacheverwaltung', 'advproxy cache replacement policy' => 'Cache Ersetzungsrichtlinie', +'advproxy cache-digest' => 'Cache-Digest-Erstellung aktivieren', 'advproxy chgwebpwd ERROR' => 'F E H L E R :', 'advproxy chgwebpwd SUCCESS' => 'E R F O L G :', 'advproxy chgwebpwd change password' => 'Passwort ändern', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 46076fd..66bf757 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -187,6 +187,7 @@ 'advproxy banned mac clients' => 'Banned MAC addresses (one per line)', 'advproxy cache management' => 'Cache management', 'advproxy cache replacement policy' => 'Cache replacement policy', +'advproxy cache-digest' => 'Enable Cache-Digest Generation', 'advproxy chgwebpwd ERROR' => 'E R R O R :', 'advproxy chgwebpwd SUCCESS' => 'S U C C E S S :', 'advproxy chgwebpwd change password' => 'Change password', diff --git a/lfs/squid b/lfs/squid index d06aede..3ede976 100644 --- a/lfs/squid +++ b/lfs/squid @@ -99,7 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-epoll \ --disable-kqueue \ --enable-select \ - --disable-cache-digests \ + --enable-cache-digests \ --enable-forw-via-db \ --enable-htcp \ --enable-ipf-transparent \

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