Merge pull request #668 from trendchiller/master

3 files changed, 25 insertions, 9 deletions

diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc
index 993508aa..92bef0fb 100644
--- a/config/squid3/31/squid_reverse.inc
+++ b/config/squid3/31/squid_reverse.inc
@@ -107,7 +107,7 @@ function squid_resync_reverse() {
  	 foreach ($reverse_peers as $rp){
  		if ($rp['enable'] =="on" && $rp['name'] !="" && $rp['ip'] !="" && $rp['port'] !=""){
  			$conf_peer = "#{$rp['description']}\n";
- 			$conf_peer .= "cache_peer {$rp['ip']} parent {$rp['port']} 0 proxy-only no-query no-digest originserver login=PASS ";
+ 			$conf_peer .= "cache_peer {$rp['ip']} parent {$rp['port']} 0 proxy-only no-query no-digest originserver login=PASS round-robin";
  			if($rp['protocol'] == 'HTTPS')
 	            	$conf_peer .= "ssl sslflags=DONT_VERIFY_PEER front-end-https=auto ";
 			$conf_peer .= "name=rvp_{$rp['name']}\n\n";
@@ -170,6 +170,8 @@ function squid_resync_reverse() {
 					array_push($owa_dirs,'Microsoft-Server-ActiveSync');
 			if($settings['reverse_owa_rpchttp'])	
 					array_push($owa_dirs,'rpc/rpcproxy.dll','rpcwithcert/rpcproxy.dll');
+			if($settings['reverse_owa_mapihttp'])	
+					array_push($owa_dirs,'mapi');
 			if($settings['reverse_owa_webservice']){
 					array_push($owa_dirs,'EWS');
 					$conf .= "ignore_expect_100 on\n";
diff --git a/config/squid3/31/squid_reverse.xml b/config/squid3/31/squid_reverse.xml
index 7c25c371..28d8cbcf 100644
--- a/config/squid3/31/squid_reverse.xml
+++ b/config/squid3/31/squid_reverse.xml
@@ -165,7 +165,7 @@
 			<fieldname>reverse_https</fieldname>
 			<description>If this field is checked, the proxy-server will act in HTTPS reverse mode. &lt;br&gt;(You have to add a rule with destination "WAN-address")</description>
 			<type>checkbox</type>
-			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
+			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
 			<required/>
 			<default_value>off</default_value>
 		</field> 
@@ -214,12 +214,12 @@
 			<fieldname>reverse_owa</fieldname>
 			<description>If this field is checked, squid will act as an accelerator/ SSL offloader for Outlook Web App.</description>
 			<type>checkbox</type>
-			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
+			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
 		</field>
 		<field>
-			<fielddescr>OWA frontend IP address</fielddescr>
+			<fielddescr>CAS-Array / OWA frontend IP address</fielddescr>
 			<fieldname>reverse_owa_ip</fieldname>
-			<description>This is the internal IP Address of the OWA frontend server.</description>
+			<description>This is the internal IP Address of the CAS-Array / OWA frontend server.</description>
 			<type>input</type>
 			<size>15</size>
 		</field>		
@@ -236,6 +236,13 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>Enable MAPI HTTP</fielddescr>
+			<fieldname>reverse_owa_mapihttp</fieldname>
+			<description><![CDATA[If this field is checked, MAPI over HTTP will be enabled.<br>
+								<strong>This feature is only available with at least Exchange 2013 SP1</strong>]]></description>
+			<type>checkbox</type>
+		</field>
+		<field>
 			<fielddescr>Enable Exchange WebServices</fielddescr>
 			<fieldname>reverse_owa_webservice</fieldname>
 			<description><![CDATA[If this field is checked, Exchange WebServices will be enabled.<br>
diff --git a/config/squid3/31/squid_reverse_general.xml b/config/squid3/31/squid_reverse_general.xml
index 2211bb20..029072a6 100644
--- a/config/squid3/31/squid_reverse_general.xml
+++ b/config/squid3/31/squid_reverse_general.xml
@@ -149,7 +149,7 @@
 			<fieldname>reverse_https</fieldname>
 			<description>If this field is checked, the proxy-server will act in HTTPS reverse mode. &lt;br&gt;(You have to add a rule with destination "WAN-address")</description>
 			<type>checkbox</type>
-			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
+			<enablefields>reverse_https_port,reverse_https_defsite,reverse_ssl_cert,reverse_int_ca,reverse_ignore_ssl_valid,reverse_owa,reverse_owa_ip,reverse_owa_webservice,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_autodiscover,reverse_ssl_chain</enablefields>
 			<required/>
 			<default_value>off</default_value>
 		</field> 
@@ -202,12 +202,12 @@
 			<fieldname>reverse_owa</fieldname>
 			<description>If this field is checked, squid will act as an accelerator/ SSL offloader for Outlook Web App.</description>
 			<type>checkbox</type>
-			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
+			<enablefields>reverse_owa_ip,reverse_owa_activesync,reverse_owa_rpchttp,reverse_owa_mapihttp,reverse_owa_webservice,reverse_owa_autodiscover</enablefields>		
 		</field>
 		<field>
-			<fielddescr>OWA frontend IP address</fielddescr>
+			<fielddescr>CAS-Array / OWA frontend IP address</fielddescr>
 			<fieldname>reverse_owa_ip</fieldname>
-			<description>This is the internal IP Address of the OWA frontend server.</description>
+			<description>This is the internal IP Address of the CAS-Array / OWA frontend server.</description>
 			<type>input</type>
 			<size>15</size>
 		</field>		
@@ -224,6 +224,13 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>Enable MAPI HTTP</fielddescr>
+			<fieldname>reverse_owa_mapihttp</fieldname>
+			<description><![CDATA[If this field is checked, MAPI over HTTP will be enabled.<br>
+								<strong>This feature is only available with at least Exchange 2013 SP1</strong>]]></description>
+			<type>checkbox</type>
+		</field>
+		<field>
 			<fielddescr>Enable Exchange WebServices</fielddescr>
 			<fieldname>reverse_owa_webservice</fieldname>
 			<description><![CDATA[If this field is checked, Exchange WebServices will be enabled.<br>