diff options
| author | Martin Fuchs <mfuchs77@gmail.com> | 2014-06-04 14:21:27 +0200 |
|---|---|---|
| committer | Martin Fuchs <mfuchs77@gmail.com> | 2014-06-04 14:21:27 +0200 |
| commit | 236fd6390a90e48a37a8c8eddec3cbdff94f26f0 (patch) | |
| tree | c6a87e3fe7de46a031659a9b760a16a3d3254c34 /config/squid3/33/squid_reverse.inc | |
| parent | 1864499d8e17202dedbbc97f3e0782737fad9a19 (diff) | |
| download | pfsense-packages-236fd6390a90e48a37a8c8eddec3cbdff94f26f0.tar.gz pfsense-packages-236fd6390a90e48a37a8c8eddec3cbdff94f26f0.tar.bz2 pfsense-packages-236fd6390a90e48a37a8c8eddec3cbdff94f26f0.zip | |
add MAPI over HTTP support
MAPI over HTTP is supported on at lease Exchange 2013 SP1
Diffstat (limited to 'config/squid3/33/squid_reverse.inc')
| -rwxr-xr-x | config/squid3/33/squid_reverse.inc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc index 34ff2366..53724fd6 100755 --- a/config/squid3/33/squid_reverse.inc +++ b/config/squid3/33/squid_reverse.inc @@ -89,9 +89,6 @@ function squid_resync_reverse() { if(!empty($settings['reverse_ip'])) { $reverse_ip = explode(";", ($settings['reverse_ip'])); foreach ($reverse_ip as $reip) { - //IPv6 Addresses need to be enclosed in brackets - if (strpos($reip, ':')) $reip = '[' . $reip . ']'; - //HTTP if (!empty($settings['reverse_http'])) $conf .= "http_port {$reip}:{$http_port} accel defaultsite={$http_defsite} vhost\n"; @@ -110,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 round-robin "; + $conf_peer .= "cache_peer {$rp['ip']} parent {$rp['port']} 0 proxy-only no-query no-digest originserver login=PASS "; if($rp['protocol'] == 'HTTPS') $conf_peer .= "ssl sslflags=DONT_VERIFY_PEER front-end-https=auto "; $conf_peer .= "name=rvp_{$rp['name']}\n\n"; @@ -173,10 +170,12 @@ 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_webservice']){ + 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"; Obsolete on 3.3 - } + $conf .= "ignore_expect_100 on\n"; + } } if (is_array($owa_dirs)) foreach ($owa_dirs as $owa_dir) @@ -186,7 +185,7 @@ function squid_resync_reverse() { $reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.'); $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n"; } - } + } //$conf .= "ssl_unclean_shutdown on"; if (is_array($reverse_maps)) foreach ($reverse_maps as $rm){ |