|
@@ -894,8 +894,8 @@ |
|
|
block discarded – undo |
|
894
|
894
|
*/ |
|
895
|
895
|
protected function _vcl_sub_https_redirect_fix() { |
|
896
|
896
|
$baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB); |
|
897
|
|
- $baseUrl = str_replace(array('http://','https://'), '', $baseUrl); |
|
898
|
|
- $baseUrl = rtrim($baseUrl,'/'); |
|
|
897
|
+ $baseUrl = str_replace(array('http://', 'https://'), '', $baseUrl); |
|
|
898
|
+ $baseUrl = rtrim($baseUrl, '/'); |
|
899
|
899
|
|
|
900
|
900
|
$tpl = <<<EOS |
|
901
|
901
|
if ( (req.http.host ~ "^(?i)www.$baseUrl" || req.http.host ~ "^(?i)$baseUrl") && req.http.X-Forwarded-Proto !~ "(?i)https") { |
Please login to merge, or discard this patch.