From: hno <>
Date: Sun, 16 Feb 2003 01:24:17 +0000 (+0000)
Subject: Incremental merge from rproxy
X-Git-Tag: SQUID_3_0_PRE1~335
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ac8b2258322f4f6af622158c43c53624fff28d0;p=thirdparty%2Fsquid.git

Incremental merge from rproxy

remove the "hack" to have ICP disabled in accelerator only setups even if
icp_port is configured. This should be done by setting "icp_port 0", not
by the fact that Squid is configured as a reverse proxy.

Note: later merges from rproxy will remove the httpd_accel_* directives,
making the "accelerator vs proxy" boundary much thinner.
---

diff --git a/src/icp_v2.cc b/src/icp_v2.cc
index 3392b1e606..e4ade56e46 100644
--- a/src/icp_v2.cc
+++ b/src/icp_v2.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: icp_v2.cc,v 1.76 2003/02/12 06:11:04 robertc Exp $
+ * $Id: icp_v2.cc,v 1.77 2003/02/15 18:24:17 hno Exp $
  *
  * DEBUG: section 12    Internet Cache Protocol
  * AUTHOR: Duane Wessels
@@ -548,8 +548,6 @@ icpConnectionsOpen(void)
     int x;
     socklen_t len;
     wordlist *s;
-    if (Config2.Accel.on && !Config.onoff.accel_with_proxy)
-	return;
     if ((port = Config.Port.icp) <= 0)
 	return;
     enter_suid();