aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid3/34/squid.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-02-02 13:58:29 -0200
committerRenato Botelho <garga@FreeBSD.org>2015-02-02 13:58:29 -0200
commita93180d7bdd2a6db94fa29ea8370cf7cdef75f67 (patch)
treed382f731384f780150edfd7205f42510f2bdc3f7 /config/squid3/34/squid.inc
parent5fc9cb859916ac1fdbe9fef605565545e8ed4421 (diff)
parent72b9436fbfe460b3b5c8308ad4d523d56d924bfd (diff)
downloadpfsense-packages-a93180d7bdd2a6db94fa29ea8370cf7cdef75f67.tar.gz
pfsense-packages-a93180d7bdd2a6db94fa29ea8370cf7cdef75f67.tar.bz2
pfsense-packages-a93180d7bdd2a6db94fa29ea8370cf7cdef75f67.zip
Merge pull request #789 from CinoNY/patch-3
Diffstat (limited to 'config/squid3/34/squid.inc')
-rwxr-xr-xconfig/squid3/34/squid.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index ddea98f4..69a50125 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -1025,7 +1025,8 @@ EOD;
$conf .= "acl localnet src $src\n";
$valid_acls[] = 'localnet';
}
- if ($settings['disable_xforward']) $conf .= "forwarded_for off\n";
+ if ($settings['xforward_mode']) $conf .= "forwarded_for {$settings['xforward_mode']}\n";
+ else $conf .= "forwarded_for on\n"; //only used for first run
if ($settings['disable_via']) $conf .= "via off\n";
if ($settings['disable_squidversion']) $conf .= "httpd_suppress_version_string on\n";
if (!empty($settings['uri_whitespace'])) $conf .= "uri_whitespace {$settings['uri_whitespace']}\n";