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

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

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 78a02226687c86282549937b48c619b2a2498e6f..2468981ea950cce53f5e82f42b82e0a6b8051ffb 100644 (file)
--- 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: 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
 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 4c185286ccc7097dcf377be00d61f8dde30bb782..70dbdc1e4dbe0aff5aaad06cedc2b3e645ea8c08 100644 (file)
--- 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: 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
 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 5a23c69c6ab1d68bc024a8737ecb0a05d5acf875..f17d07d758ca0b8349465ff203c6c88decc329ed 100644 (file)
--- 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: 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
 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 78a02226687c86282549937b48c619b2a2498e6f..2468981ea950cce53f5e82f42b82e0a6b8051ffb 100644 (file)
--- 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: 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
 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 0196084cb458b3af22b610698ebee5e04f1fc772..d59f4f6dc4aec2acc0ca84e425503ccc4196c5f7 100644 (file)
--- 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: 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
 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 a4eebcd70a296ca791ea7e868c04c6abe6b49bf0..ac650b3305f408cad645143bf5f71a74dc746260 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -11,6 +11,7 @@
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################

+< advproxy cache-digest

 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < attention
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < attention


@@ -134,6 +135,7 @@
 ############################################################################
 # Checking cgi-bin translations for language: es                           #
 ############################################################################
 ############################################################################
 # Checking cgi-bin translations for language: es                           #
 ############################################################################

+< advproxy cache-digest

 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < Async logging enabled
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < Async logging enabled


@@ -250,6 +252,7 @@
 ############################################################################
 # Checking cgi-bin translations for language: pl                           #
 ############################################################################
 ############################################################################
 # Checking cgi-bin translations for language: pl                           #
 ############################################################################

+< advproxy cache-digest

 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < attention
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < attention


@@ -342,6 +345,7 @@
 # Checking cgi-bin translations for language: ru                           #
 ############################################################################
 < Add a route
 # Checking cgi-bin translations for language: ru                           #
 ############################################################################
 < Add a route

+< advproxy cache-digest

 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < attention
 < advproxy errmsg cache
 < advproxy errmsg invalid upstream proxy
 < attention

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index cc7416a9439ba86fb54bc8d41f3fa8e4e2dfb738..901ed7250466d84a2aa6a0c043a3b3745d5e6098 100644 (file)
--- 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_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';
 $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{'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'} = '';
 
 $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>
        <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%'>
 </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"; }
        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'))
        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 f9405d7be7a32e43ca475d125fc5f1f6b05ac1c7..03f9a42700a1b32e1575e8a0e9a5edf788700cd4 100644 (file)
--- 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 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',
 '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 46076fd6c264bfa11c07143aa8b7c8974a531441..66bf757941bd59d5f443f1c08c682aabada52a83 100644 (file)
--- 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 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',
 '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 d06aedeb519fe9a7693cda9d1597deb38d28c4e9..3ede976109819caa9d673c7cdeecc3c7e39027c8 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -99,7 +99,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
           --enable-epoll \
           --disable-kqueue \
           --enable-select \
           --enable-epoll \
           --disable-kqueue \
           --enable-select \

-          --disable-cache-digests \
+          --enable-cache-digests \

           --enable-forw-via-db \
           --enable-htcp \
           --enable-ipf-transparent \
           --enable-forw-via-db \
           --enable-htcp \
           --enable-ipf-transparent \