From 8beb3fd8196a582e4aa75ff1c430e6a8e6363901 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <mfuchs77@gmail.com>
Date: Fri, 18 Jul 2014 13:04:30 +0200
Subject: we do not need digests for Exchange-peers

---
 config/squid3/33/squid_reverse.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/squid3/33')

diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc
index a6b81c0b..25f0ae93 100755
--- a/config/squid3/33/squid_reverse.inc
+++ b/config/squid3/33/squid_reverse.inc
@@ -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";
 			}
 		}
 		
-- 
cgit v1.2.3


From 9485b386dba7a4fbdfbc7941071cd4574f24c91c Mon Sep 17 00:00:00 2001
From: Martin Fuchs <mfuchs77@gmail.com>
Date: Fri, 18 Jul 2014 15:47:40 +0200
Subject: add a hint for autodiscover over HTTP

---
 config/squid3/33/squid_reverse_general.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config/squid3/33')

diff --git a/config/squid3/33/squid_reverse_general.xml b/config/squid3/33/squid_reverse_general.xml
index 8b2a8c9b..296db638 100755
--- a/config/squid3/33/squid_reverse_general.xml
+++ b/config/squid3/33/squid_reverse_general.xml
@@ -241,7 +241,8 @@
 			<fielddescr>Enable AutoDiscover</fielddescr>
 			<fieldname>reverse_owa_autodiscover</fieldname>
 			<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>
+								<strong>You also should set up the autodiscover DNS-record to point to you WAN-IP.<br>
+								HTTP-reverse Proxy should be enabled for most compability.</strong>]]></description>
 			<type>checkbox</type>
 		</field>
 	</fields>
-- 
cgit v1.2.3


From 6c9bbf39f0dd898fad419b7a373375ef1faf2b50 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <mfuchs77@gmail.com>
Date: Sun, 20 Jul 2014 11:51:48 +0200
Subject: Revert "add a hint for autodiscover over HTTP"

This reverts commit 9485b386dba7a4fbdfbc7941071cd4574f24c91c.
---
 config/squid3/33/squid_reverse_general.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'config/squid3/33')

diff --git a/config/squid3/33/squid_reverse_general.xml b/config/squid3/33/squid_reverse_general.xml
index 296db638..8b2a8c9b 100755
--- a/config/squid3/33/squid_reverse_general.xml
+++ b/config/squid3/33/squid_reverse_general.xml
@@ -241,8 +241,7 @@
 			<fielddescr>Enable AutoDiscover</fielddescr>
 			<fieldname>reverse_owa_autodiscover</fieldname>
 			<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.<br>
-								HTTP-reverse Proxy should be enabled for most compability.</strong>]]></description>
+								<strong>You also should set up the autodiscover DNS-record to point to you WAN-IP.</strong>]]></description>
 			<type>checkbox</type>
 		</field>
 	</fields>
-- 
cgit v1.2.3


From 0813e48c1dc469c2a0633fed512e0258af36da31 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <mfuchs77@gmail.com>
Date: Mon, 21 Jul 2014 00:34:38 +0200
Subject: autocreate http-reverse for autodiscover

---
 config/squid3/33/squid_reverse.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/squid3/33')

diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc
index 25f0ae93..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']))
-- 
cgit v1.2.3