From c3696f0b3c4d2736b4ec8875ca18bec9cdeaa47d Mon Sep 17 00:00:00 2001
From: Martin <martin.fuchs@trendchiller.com>
Date: Wed, 4 Nov 2009 14:27:31 +0100
Subject: fix bug#128 - squid upstream proxy

---
 config/squid/squid.inc  | 6 +++++-
 config/squid3/squid.inc | 6 +++++-
 pkg_config.7.xml        | 4 ++--
 pkg_config.8.xml        | 4 ++--
 pkg_config.xml          | 2 +-
 5 files changed, 15 insertions(+), 7 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']}";
diff --git a/pkg_config.7.xml b/pkg_config.7.xml
index efe733fa..ac011c25 100755
--- a/pkg_config.7.xml
+++ b/pkg_config.7.xml
@@ -662,7 +662,7 @@
       <descr>High performance web proxy cache.</descr>
       <website>http://www.squid-cache.org/</website>
       <category>Network</category>
-      <version>2.7.7</version>
+      <version>2.7.8</version>
       <status>Stable</status>
       <required_version>1.2.1</required_version>
       <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer>
@@ -678,7 +678,7 @@
       <descr>EXPERIMENTAL! Not all directives are ported yet! High performance web proxy cache.</descr>
       <website>http://www.squid-cache.org/</website>
       <category>Network</category>
-      <version>3.0.8_08</version>
+      <version>3.0.8_09</version>
       <status>ALPHA</status>
       <required_version>1.2.1</required_version>
       <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 250646da..3d3964c9 100755
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -574,7 +574,7 @@
       <descr>High performance web proxy cache.</descr>
       <website>http://www.squid-cache.org/</website>
       <category>Network</category>
-      <version>2.6.21_10</version>
+      <version>2.6.21_11</version>
       <status>Stable</status>
       <required_version>1.2.1</required_version>
       <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer>
@@ -590,7 +590,7 @@
       <descr>EXPERIMENTAL! Not all directives are ported yet! High performance web proxy cache.</descr>
       <website>http://www.squid-cache.org/</website>
       <category>Network</category>
-      <version>3.0.8_08</version>
+      <version>3.0.8_09</version>
       <status>ALPHA</status>
       <required_version>1.2.1</required_version>
       <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer>
diff --git a/pkg_config.xml b/pkg_config.xml
index e1773ca6..e3f796eb 100644
--- a/pkg_config.xml
+++ b/pkg_config.xml
@@ -537,7 +537,7 @@
       <descr>High performance web proxy cache.</descr>
       <website>http://www.squid-cache.org/</website>
       <category>Network</category>
-      <version>2.6.21_10</version>
+      <version>2.6.21_11</version>
       <status>Stable</status>
       <required_version>1.0</required_version>
       <maintainer>fernando@netfilter.com.br seth.mos@xs4all.nl mfuchs77@googlemail.com</maintainer>
-- 
cgit v1.2.3