diff --git a/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php b/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php index ff007c489..2ad709ca1 100644 --- a/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php +++ b/app/code/community/Nexcessnet/Turpentine/Model/Varnish/Configurator/Abstract.php @@ -808,18 +808,23 @@ protected function _vcl_acl($name, array $hosts) { * @return string */ protected function _vcl_sub_normalize_user_agent() { - /** - * Mobile regex from - * @link http://magebase.com/magento-tutorials/magento-design-exceptions-explained/ - */ + + $mobileRegexp = $this->_getMobileUserAgentRegex(); $tpl = <<_vcl_sub_https_proto_fix(); } - + if (Mage::getStoreConfig('turpentine_varnish/general/https_redirect_fix')) { $vars['https_redirect'] = $this->_vcl_sub_https_redirect_fix(); if (Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.0' || Mage::getStoreConfig('turpentine_varnish/servers/version') == '4.1') { diff --git a/app/code/community/Nexcessnet/Turpentine/etc/config.xml b/app/code/community/Nexcessnet/Turpentine/etc/config.xml index 3e53e68af..9fc74ce3c 100644 --- a/app/code/community/Nexcessnet/Turpentine/etc/config.xml +++ b/app/code/community/Nexcessnet/Turpentine/etc/config.xml @@ -72,6 +72,7 @@ 1 0 + 0 diff --git a/app/code/community/Nexcessnet/Turpentine/etc/system.xml b/app/code/community/Nexcessnet/Turpentine/etc/system.xml index 4ac2c8947..114ad9653 100644 --- a/app/code/community/Nexcessnet/Turpentine/etc/system.xml +++ b/app/code/community/Nexcessnet/Turpentine/etc/system.xml @@ -507,6 +507,18 @@ 0 0 + + + + text + 25 + 1 + 0 + 0 + + 1 + + Force requests to be for a specific domain name, will probably break most multi-store setups