dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #225 from emily-d/development

Browse Source 
[-] FO : PS_SSL_ENABLED and mod_rewrite yields a 301 error (Too Many Red...
This commit is contained in:
Vincent Augagneur committed 2013-05-21 02:27:30 -07:00
2 parents 0ddc7e0e4b 82cb9f8ba9
commit 70b061343b
1 file changed
+3
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+3
View File
@@ -267,6 +267,9 @@ class ToolsCore
// $_SERVER['SSL'] exists only in some specific configuration // $_SERVER['SSL'] exists only in some specific configuration
if (isset($_SERVER['SSL'])) if (isset($_SERVER['SSL']))
return ($_SERVER['SSL'] == 1 || strtolower($_SERVER['SSL']) == 'on'); return ($_SERVER['SSL'] == 1 || strtolower($_SERVER['SSL']) == 'on');
// $_SERVER['REDIRECT_HTTPS'] exists only in some specific configuration (e.g. Gandi's simple hosting)
if (isset($_SERVER['REDIRECT_HTTPS']))
return ($_SERVER['REDIRECT_HTTPS'] == 1 || strtolower($_SERVER['REDIRECT_HTTPS']) == 'on');
return false; return false;
} }