From 5bf67414fb8f34516189c97fb1b8f65b28756871 Mon Sep 17 00:00:00 2001
From: Cino <cinony@gmail.com>
Date: Fri, 16 Jan 2015 10:23:59 -0500
Subject: add new X-Forward Mode options

---
 config/squid3/34/squid.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/config/squid3/34/squid.xml b/config/squid3/34/squid.xml
index 9bd31d5f..8103ce2c 100644
--- a/config/squid3/34/squid.xml
+++ b/config/squid3/34/squid.xml
@@ -485,10 +485,18 @@
 			<default_value>en</default_value>
 		</field>
 		<field>
-			<fielddescr>Disable X-Forward</fielddescr>
-			<fieldname>disable_xforward</fieldname>
-			<description>If not set, Squid will include your system's IP address or name in the HTTP requests it forwards.</description>
-			<type>checkbox</type>
+			<fielddescr>X-Forward Mode</fielddescr>
+			<fieldname>xforward_mode</fieldname>
+			<description>&lt;p&gt;&lt;b&gt; on:&lt;/b&gt; Squid will append your client's IP address in the HTTP requests it forwards. (Default)&lt;p&gt;          By default it looks like: X-Forwarded-For: 192.1.2.3  &lt;p&gt; &lt;b&gt; off:&lt;/b&gt; It will appear as: X-Forwarded-For: unknown&lt;p&gt; &lt;b&gt; transparent:&lt;/b&gt; Squid will not alter the X-Forwarded-For header in any way.&lt;p&gt; &lt;b&gt; delete:&lt;/b&gt; Squid will delete the entire X-Forwarded-For header.&lt;p&gt; &lt;b&gt; truncate:&lt;/b&gt; Squid will remove all existing X-Forwarded-For entries, and place the client IP as the sole entry.</description>
+			<type>select</type>
+			<default_value>on</default_value>
+			<options>
+				<option><name>(on)</name><value>on</value></option>
+				<option><name>off</name><value>off</value></option>
+				<option><name>transparent</name><value>transparent</value></option>
+				<option><name>delete</name><value>delete</value></option>
+				<option><name>truncate</name><value>truncate</value></option>
+			</options>
 		</field>
 		<field>
 			<fielddescr>Disable VIA</fielddescr>
-- 
cgit v1.2.3


From 273ce40be69f8d052d8375cdefec203b8c4bf5ac Mon Sep 17 00:00:00 2001
From: Cino <cinony@gmail.com>
Date: Fri, 16 Jan 2015 10:25:14 -0500
Subject: add new X-Forward Mode options

---
 config/squid3/34/squid.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/squid3/34/squid.inc b/config/squid3/34/squid.inc
index e2c8c71a..a058927e 100755
--- a/config/squid3/34/squid.inc
+++ b/config/squid3/34/squid.inc
@@ -1030,7 +1030,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";
-- 
cgit v1.2.3


From 72b9436fbfe460b3b5c8308ad4d523d56d924bfd Mon Sep 17 00:00:00 2001
From: Cino <cinony@gmail.com>
Date: Fri, 16 Jan 2015 12:16:05 -0500
Subject: Add new X-Forward Mode option to GUI

---
 pkg_config.10.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index b4e5f405..394cb595 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -909,7 +909,7 @@
 		<pkginfolink>https://forum.pfsense.org/index.php/topic,48347.0.html</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
 		<category>Network</category>
-		<version>3.4.10_2 pkg 0.2.5</version>
+		<version>3.4.10_2 pkg 0.2.6</version>
 		<status>beta</status>
 		<required_version>2.2</required_version>
 		<maintainer>marcellocoutinho@gmail.com fernando@netfilter.com.br seth.mos@dds.nl mfuchs77@googlemail.com jimp@pfsense.org</maintainer>
-- 
cgit v1.2.3