aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid-reverse/squid.inc
diff options
context:
space:
mode:
authorMartin Fuchs <martin.fuchs@trendchiller.com>2012-03-19 22:46:27 +0100
committerMartin Fuchs <martin.fuchs@trendchiller.com>2012-03-19 22:46:27 +0100
commite1bfcb5c5e503269801e32cd22c6f4c833342b47 (patch)
treec229964bd865a8eb5af688fde587881dde58887a /config/squid-reverse/squid.inc
parent54054e830d3b4f685444b07eed55dc57ef1c1021 (diff)
downloadpfsense-packages-e1bfcb5c5e503269801e32cd22c6f4c833342b47.tar.gz
pfsense-packages-e1bfcb5c5e503269801e32cd22c6f4c833342b47.tar.bz2
pfsense-packages-e1bfcb5c5e503269801e32cd22c6f4c833342b47.zip
fix squid.inc error
Diffstat (limited to 'config/squid-reverse/squid.inc')
-rw-r--r--config/squid-reverse/squid.inc4
1 files changed, 0 insertions, 4 deletions
diff --git a/config/squid-reverse/squid.inc b/config/squid-reverse/squid.inc
index 979549f2..f9cca8a0 100644
--- a/config/squid-reverse/squid.inc
+++ b/config/squid-reverse/squid.inc
@@ -1094,11 +1094,7 @@ function squid_resync_reverse() {
foreach ($defs as $def) {
$cfg = explode(";",($def));
if (($cfg[0]) != '' && ($cfg[1]) != '' && ($cfg[2]) != ''){
-<<<<<<< HEAD
$conf .= "cache_peer {$cfg[1]} parent {$cfg[2]} 0 proxy-only no-query originserver login=PASS ";
-=======
- $conf .= "cache_peer {$cfg[1]} parent {$cfg[2]} 0 proxy-only no-query login=PASS originserver ";
->>>>>>> upstream/master
if($cfg[3] == 'HTTPS')
$conf .= "ssl sslflags=DONT_VERIFY_PEER front-end-https=auto ";
$conf .= "name={$cfg[0]}\n";