Merge git+ssh://github.com/pfsense/pfsense-packages

6 files changed, 16 insertions, 12 deletions

diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc
index d2611c79..badaeebe 100644
--- a/config/squid3/31/squid_reverse.inc
+++ b/config/squid3/31/squid_reverse.inc
@@ -78,7 +78,7 @@ function squid_resync_reverse() {
 		$real_ifaces[] = squid_get_real_interface_address($iface);
 		if($real_ifaces[$i][0]) {
 		      //HTTP
-		      if (!empty($settings['reverse_http']))
+		      if (!empty($settings['reverse_http']) OR ($settings['reverse_owa_autodiscover'] == 'on'))
 		      		$conf .= "http_port {$real_ifaces[$i][0]}:{$http_port} accel defaultsite={$http_defsite} vhost\n";
 		      //HTTPS
 		      if (!empty($settings['reverse_https']))
@@ -90,7 +90,7 @@ function squid_resync_reverse() {
 		$reverse_ip = explode(";", ($settings['reverse_ip']));
 		foreach ($reverse_ip as $reip) {
 		      //HTTP
-		      if (!empty($settings['reverse_http']))
+		      if (!empty($settings['reverse_http']) OR ($settings['reverse_owa_autodiscover'] == 'on'))
 		      		$conf .= "http_port {$reip}:{$http_port} accel defaultsite={$http_defsite} vhost\n";
 		      //HTTPS
 		      if (!empty($settings['reverse_https']))
@@ -106,8 +106,8 @@ function squid_resync_reverse() {
 			$casnr = 0;
 			foreach ($reverse_owa_ip as $reowaip) {
 				$casnr++;
-				$conf .= "cache_peer {$reowaip} parent 443 0 proxy-only no-query originserver login=PASS ssl sslflags=DONT_VERIFY_PEER front-end-https=on name=OWA_HOST_443_{$casnr}_pfs\n";
-				$conf .= "cache_peer {$reowaip} parent 80 0 proxy-only no-query originserver login=PASS name=OWA_HOST_80_{$casnr}_pfs\n";
+				$conf .= "cache_peer {$reowaip} parent 443 0 proxy-only no-query no-digest originserver login=PASS ssl sslflags=DONT_VERIFY_PEER front-end-https=on name=OWA_HOST_443_{$casnr}_pfs\n";
+				$conf .= "cache_peer {$reowaip} parent 80 0 proxy-only no-query no-digest originserver login=PASS name=OWA_HOST_80_{$casnr}_pfs\n";
 			}
 		}
 		
diff --git a/config/squid3/31/squid_reverse.xml b/config/squid3/31/squid_reverse.xml
index b3a4c6cb..40fb0ec1 100644
--- a/config/squid3/31/squid_reverse.xml
+++ b/config/squid3/31/squid_reverse.xml
@@ -252,7 +252,8 @@
 		<field>
 			<fielddescr>Enable AutoDiscover</fielddescr>
 			<fieldname>reverse_owa_autodiscover</fieldname>
-			<description>If this field is checked, AutoDiscover will be enabled.</description>
+			<description><![CDATA[If this field is checked, AutoDiscover will be enabled.<br>
+								<strong>You also should set up the autodiscover DNS-record to point to you WAN-IP.</strong>]]></description>
 			<type>checkbox</type>
 		</field>
 		<field>
diff --git a/config/squid3/31/squid_reverse_general.xml b/config/squid3/31/squid_reverse_general.xml
index 47426c8e..1795edf5 100644
--- a/config/squid3/31/squid_reverse_general.xml
+++ b/config/squid3/31/squid_reverse_general.xml
@@ -240,7 +240,8 @@
 		<field>
 			<fielddescr>Enable AutoDiscover</fielddescr>
 			<fieldname>reverse_owa_autodiscover</fieldname>
-			<description>If this field is checked, AutoDiscover will be enabled.</description>
+			<description><![CDATA[If this field is checked, AutoDiscover will be enabled.<br>
+								<strong>You also should set up the autodiscover DNS-record to point to you WAN-IP.</strong>]]></description>
 			<type>checkbox</type>
 		</field>
 	</fields>
diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc
index a6b81c0b..1332f220 100755
--- a/config/squid3/33/squid_reverse.inc
+++ b/config/squid3/33/squid_reverse.inc
@@ -78,7 +78,7 @@ function squid_resync_reverse() {
 		$real_ifaces[] = squid_get_real_interface_address($iface);
 		if($real_ifaces[$i][0]) {
 		      //HTTP
-		      if (!empty($settings['reverse_http']))
+		      if (!empty($settings['reverse_http']) OR ($settings['reverse_owa_autodiscover'] == 'on'))
 		      		$conf .= "http_port {$real_ifaces[$i][0]}:{$http_port} accel defaultsite={$http_defsite} vhost\n";
 		      //HTTPS
 		      if (!empty($settings['reverse_https']))
@@ -90,7 +90,7 @@ function squid_resync_reverse() {
 		$reverse_ip = explode(";", ($settings['reverse_ip']));
 		foreach ($reverse_ip as $reip) {
 		      //HTTP
-		      if (!empty($settings['reverse_http']))
+		      if (!empty($settings['reverse_http']) OR ($settings['reverse_owa_autodiscover'] == 'on'))
 		      		$conf .= "http_port {$reip}:{$http_port} accel defaultsite={$http_defsite} vhost\n";
 		      //HTTPS
 		      if (!empty($settings['reverse_https']))
@@ -106,8 +106,8 @@ function squid_resync_reverse() {
 			$casnr = 0;
 			foreach ($reverse_owa_ip as $reowaip) {
 				$casnr++;
-				$conf .= "cache_peer {$reowaip} parent 443 0 proxy-only no-query originserver login=PASSTHRU connection-auth=on ssl sslflags=DONT_VERIFY_PEER front-end-https=on name=OWA_HOST_443_{$casnr}_pfs\n";
-				$conf .= "cache_peer {$reowaip} parent 80 0 proxy-only no-query originserver login=PASSTHRU connection-auth=on name=OWA_HOST_80_{$casnr}_pfs\n";
+				$conf .= "cache_peer {$reowaip} parent 443 0 proxy-only no-query no-digest originserver login=PASSTHRU connection-auth=on ssl sslflags=DONT_VERIFY_PEER front-end-https=on name=OWA_HOST_443_{$casnr}_pfs\n";
+				$conf .= "cache_peer {$reowaip} parent 80 0 proxy-only no-query no-digest originserver login=PASSTHRU connection-auth=on name=OWA_HOST_80_{$casnr}_pfs\n";
 			}
 		}
 		
diff --git a/config/squid3/33/squid_reverse.xml b/config/squid3/33/squid_reverse.xml
index b3a4c6cb..40fb0ec1 100755
--- a/config/squid3/33/squid_reverse.xml
+++ b/config/squid3/33/squid_reverse.xml
@@ -252,7 +252,8 @@
 		<field>
 			<fielddescr>Enable AutoDiscover</fielddescr>
 			<fieldname>reverse_owa_autodiscover</fieldname>
-			<description>If this field is checked, AutoDiscover will be enabled.</description>
+			<description><![CDATA[If this field is checked, AutoDiscover will be enabled.<br>
+								<strong>You also should set up the autodiscover DNS-record to point to you WAN-IP.</strong>]]></description>
 			<type>checkbox</type>
 		</field>
 		<field>
diff --git a/config/squid3/33/squid_reverse_general.xml b/config/squid3/33/squid_reverse_general.xml
index 47426c8e..1795edf5 100755
--- a/config/squid3/33/squid_reverse_general.xml
+++ b/config/squid3/33/squid_reverse_general.xml
@@ -240,7 +240,8 @@
 		<field>
 			<fielddescr>Enable AutoDiscover</fielddescr>
 			<fieldname>reverse_owa_autodiscover</fieldname>
-			<description>If this field is checked, AutoDiscover will be enabled.</description>
+			<description><![CDATA[If this field is checked, AutoDiscover will be enabled.<br>
+								<strong>You also should set up the autodiscover DNS-record to point to you WAN-IP.</strong>]]></description>
 			<type>checkbox</type>
 		</field>
 	</fields>