aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/squid/squid.inc6
-rw-r--r--packages/squid/squid.xml9
2 files changed, 11 insertions, 4 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc
index db647876..4c2cb82e 100644
--- a/packages/squid/squid.inc
+++ b/packages/squid/squid.inc
@@ -500,7 +500,6 @@ cache_effective_group proxy
error_directory $errordir
visible_hostname $hostname
cache_mgr $email
-
access_log $logdir_access
cache_log $logdir_cache
cache_store_log none
@@ -521,11 +520,12 @@ EOD;
}
if ($settings['disable_xforward']) $conf .= "forwarded_for off\n";
if ($settings['disable_via']) $conf .= "via off\n";
- if (!empty($settings['uri_whitespace'])) $conf .= "uri_whitespace {$settings['uri_whitespace']}\n";
-
+ $conf .= "uri_whitespace {$settings['uri_whitespace']}\n";
+ if (!empty($settings['dns_nameservers'])) $conf .= "dns_nameservers {$settings['dns_nameservers']}\n";
return $conf;
}
+
function squid_resync_cache() {
global $config;
diff --git a/packages/squid/squid.xml b/packages/squid/squid.xml
index 5c19d96f..9f138ed9 100644
--- a/packages/squid/squid.xml
+++ b/packages/squid/squid.xml
@@ -242,7 +242,7 @@
<type>checkbox</type>
</field>
<field>
- <fielddescr>What to do with requests that have whitespace characters in the URI.</fielddescr>
+ <fielddescr>What to do with requests that have whitespace characters in the URI</fielddescr>
<fieldname>uri_whitespace</fieldname>
<description>&lt;b&gt; strip:&lt;/b&gt; The whitespace characters are stripped out of the URL. This is the behavior recommended by RFC2396. &lt;p&gt; &lt;b&gt; deny:&lt;/b&gt; The request is denied. The user receives an "Invalid Request" message.&lt;p&gt; &lt;b&gt; allow:&lt;/b&gt; The request is allowed and the URI is not changed. The whitespace characters remain in the URI.&lt;p&gt; &lt;b&gt; encode:&lt;/b&gt; The request is allowed and the whitespace characters are encoded according to RFC1738.&lt;p&gt; &lt;b&gt; chop:&lt;/b&gt; The request is allowed and the URI is chopped at the first whitespace.</description>
<type>select</type>
@@ -271,6 +271,13 @@
</options>
</field>
<field>
+ <fielddescr>Use different DNS-servers for the proxy-server</fielddescr>
+ <fieldname>dns_nameservers</fieldname>
+ <description>If you want to use other DNS-servers than the DNS-forwarder, enter the IPs here separated by spaces.</description>
+ <type>input</type>
+ <size>60</size>
+ </field>
+ <field>
<fielddescr>Custom Options</fielddescr>
<fieldname>custom_options</fieldname>
<description>You can put your own custom options here, separated by semi-colons (;). They'll be added to the configuration. They need to be squid.conf native options, otherwise squid will NOT work.</description>