aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin <martin.fuchs@trendchiller.com>2009-11-04 14:27:31 +0100
committerMartin <martin.fuchs@trendchiller.com>2009-11-04 14:27:31 +0100
commitc3696f0b3c4d2736b4ec8875ca18bec9cdeaa47d (patch)
treee939fc8b7c0b3e5d57ed655ef0e5a59e4283d428 /config
parentdb24f22d20011b9f4d44898e03c810e6b8b721eb (diff)
downloadpfsense-packages-c3696f0b3c4d2736b4ec8875ca18bec9cdeaa47d.tar.gz
pfsense-packages-c3696f0b3c4d2736b4ec8875ca18bec9cdeaa47d.tar.bz2
pfsense-packages-c3696f0b3c4d2736b4ec8875ca18bec9cdeaa47d.zip
fix bug#128 - squid upstream proxy
Diffstat (limited to 'config')
-rw-r--r--config/squid/squid.inc6
-rw-r--r--config/squid3/squid.inc6
2 files changed, 10 insertions, 2 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 2f77c465..1f264a64 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -725,7 +725,11 @@ function squid_resync_upstream() {
$conf = '';
if ($settings['proxy_forwarding'] == 'on') {
- $conf .= "cache_peer {$settings['proxy_addr']} parent {$settings['proxy_port']} {$settings['icp_port']} ";
+ $conf .= "cache_peer {$settings['proxy_addr']} parent {$settings['proxy_port']} ";
+ if ($settings['icp_port'] == '7')
+ $conf .= "{$settings['icp_port']} no-query";
+ else
+ $conf .= "{$settings['icp_port']}";
if (!empty($settings['username']))
$conf .= " login={$settings['username']}";
diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc
index 821493ad..acb5a2d3 100644
--- a/config/squid3/squid.inc
+++ b/config/squid3/squid.inc
@@ -711,7 +711,11 @@ function squid_resync_upstream() {
$conf = '';
if ($settings['proxy_forwarding'] == 'on') {
- $conf .= "cache_peer {$settings['proxy_addr']} parent {$settings['proxy_port']} {$settings['icp_port']} ";
+ $conf .= "cache_peer {$settings['proxy_addr']} parent {$settings['proxy_port']} ";
+ if ($settings['icp_port'] == '7')
+ $conf .= "{$settings['icp_port']} no-query";
+ else
+ $conf .= "{$settings['icp_port']}";
if (!empty($settings['username']))
$conf .= " login={$settings['username']}";