Remove httpd_accel for Squid 2.6

diff --git a/squid/CHANGELOG b/squid/CHANGELOG
index 7409ab1..721687f 100644 (file)
--- a/squid/CHANGELOG
+++ b/squid/CHANGELOG
@@ -20,3 +20,5 @@ Fixed transparent proxy setup in Squid 2.6.
 Added support for editing proxy reply restrictions, thanks to Steve Williams.
 Re-design the Access Control page to use tabs, to better split up the lists of ACLs, HTTP and ICP restrictions.
 Ensure that HTTP and ICP restrictions are created after ACLs in the config file.
+---- Changes since 1.390 ----
+The httpd_accel family of directives are no longer shown when using Squid versions 2.6 and above (as they have been deprecated).

diff --git a/squid/edit_misc.cgi b/squid/edit_misc.cgi
index ccd519e..82c7b05 100755 (executable)
--- a/squid/edit_misc.cgi
+++ b/squid/edit_misc.cgi
@@ -88,7 +88,7 @@ elsif ($squid_version < 2.2) {
 print &opt_input($text{'emisc_fua'}, "fake_user_agent", $conf, $text{'none'}, 15);
 
 print "</tr><tr>\n";
-if ($squid_version < 3.0) {
+if ($squid_version < 2.6) {
        $host = &find_value("httpd_accel_host", $conf);
        print "<td><b>$text{'emisc_hah'}</b></td> <td colspan=3>\n";
        printf "<input type=radio name=accel value=0 %s> %s\n",

diff --git a/squid/edit_sports.cgi b/squid/edit_sports.cgi
index 99b14bb..1fbfe55 100755 (executable)
--- a/squid/edit_sports.cgi
+++ b/squid/edit_sports.cgi
@@ -51,21 +51,6 @@ print &opt_input($text{'emisc_sdta'}, "dns_testnames", $conf,
                 $text{'default'}, 40);
 print "</tr>\n";
 
-print "<tr> <td colspan=4><hr></td> </tr>\n";
-
-print "</tr><tr>\n";
-print &opt_input($text{'emisc_hah'}, "httpd_accel_host", $conf,
-                 $text{'default'}, 50);
-print "</tr><tr>\n";
-print &opt_input($text{'emisc_hap'}, "httpd_accel_port", $conf,
-                 $text{'default'}, 10);
-print "</tr><tr>\n";
-print &choice_input($text{'emisc_hawp'}, "httpd_accel_with_proxy",
-                  $conf, "off", $text{'on'}, "on", $text{'off'}, "off");
-print &choice_input($text{'emisc_hauhh'}, "httpd_accel_uses_host_header", 
-                  $conf, "off", $text{'yes'}, "on", $text{'no'}, "off");
-print "</tr><tr>\n";
-
 print "</table></td></tr></table>\n";
 print "<input type=submit value='$text{'buttsave'}'></form>\n";
 

diff --git a/squid/save_iptables.cgi b/squid/save_iptables.cgi
index d530ade..72cd49d 100755 (executable)
--- a/squid/save_iptables.cgi
+++ b/squid/save_iptables.cgi
@@ -75,7 +75,7 @@ if ($in{'enabled'}) {
                                    'values' => [ 'virtual' ] } ]);
                }
        else {
-               # In Squid 2.6, acceleration is a port option
+               # In Squid 2.6+, acceleration is a port option
                @ports = &find_config("http_port", $conf);
                foreach my $p (@ports) {
                        local $trans = 0;

diff --git a/squid/save_misc.cgi b/squid/save_misc.cgi
index b529418..ec684a1 100755 (executable)
--- a/squid/save_misc.cgi
+++ b/squid/save_misc.cgi
@@ -39,7 +39,7 @@ elsif ($squid_version < 2.2) {
        }
 &save_opt("fake_user_agent", undef, $conf);
 &save_choice("memory_pools", "on", $conf);
-if ($squid_version < 3.0) {
+if ($squid_version < 2.6) {
        if ($in{'accel'} == 0) {
                &save_directive($conf, "httpd_accel_host", [ ]);
                }

diff --git a/squid/save_sports.cgi b/squid/save_sports.cgi
index fe826be..d9493d4 100755 (executable)
--- a/squid/save_sports.cgi
+++ b/squid/save_sports.cgi
@@ -33,10 +33,6 @@ else {
        }
 
 &save_opt("dns_testnames", undef, $conf);
-&save_opt("httpd_accel_host", undef, $conf);
-&save_opt("httpd_accel_port", undef, $conf);
-&save_choice("httpd_accel_with_proxy", undef, $conf);
-&save_choice("httpd_accel_uses_host_header", undef, $conf);
 
 &flush_file_lines();
 &unlock_file($config{'squid_conf'});