diff options
Diffstat (limited to 'config/squid3/33')
-rwxr-xr-x | config/squid3/33/squid.inc | 2 | ||||
-rwxr-xr-x | config/squid3/33/squid_reverse.inc | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/config/squid3/33/squid.inc b/config/squid3/33/squid.inc index 0c3b4d7e..a97746e2 100755 --- a/config/squid3/33/squid.inc +++ b/config/squid3/33/squid.inc @@ -1076,7 +1076,7 @@ EOC; range_offset_limit -1 refresh_pattern -i microsoft.com/.*\.(cab|exe|ms[i|u|f]|asf|wm[v|a]|dat|zip) 4320 80% 43200 reload-into-ims refresh_pattern -i windowsupdate.com/.*\.(cab|exe|ms[i|u|f]|asf|wm[v|a]|dat|zip) 4320 80% 43200 reload-into-ims -refresh_pattern -i my.windowsupdate.website.com/.*\.(cab|exe|ms[i|u|f]|asf|wm[v|a]|dat|zip) 4320 80% 43200 reload-into-ims +refresh_pattern -i windows.com/.*\.(cab|exe|ms[i|u|f]|asf|wm[v|a]|dat|zip) 4320 80% 43200 reload-into-ims EOC; } diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc index 08c7b388..34ff2366 100755 --- a/config/squid3/33/squid_reverse.inc +++ b/config/squid3/33/squid_reverse.inc @@ -173,8 +173,6 @@ 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_autodiscover']) - array_push($owa_dirs,'autodiscover'); if($settings['reverse_owa_webservice']){ array_push($owa_dirs,'EWS'); //$conf .= "ignore_expect_100 on\n"; Obsolete on 3.3 @@ -183,6 +181,11 @@ function squid_resync_reverse() { if (is_array($owa_dirs)) foreach ($owa_dirs as $owa_dir) $conf .= "acl OWA_URI_pfs url_regex -i ^https://{$settings['reverse_external_fqdn']}/$owa_dir.*$\n"; + + if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) { + $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)) |