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

// FIX #PSCFV-4302

Browse Source
This commit is contained in:
rGaillard
2012-09-24 12:02:17 +00:00
parent b1999bba45
commit 5f214dabfa
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cookie.php
+4 -1
View File
@@ -82,7 +82,10 @@ class CookieCore
protected function getDomain($shared_urls = null) protected function getDomain($shared_urls = null)
{ {
$r = '!(?:(\w+)://)?(?:(\w+)\:(\w+)@)?([^/:]+)?(?:\:(\d*))?([^#?]+)?(?:\?([^#]+))?(?:#(.+$))?!i'; $r = '!(?:(\w+)://)?(?:(\w+)\:(\w+)@)?([^/:]+)?(?:\:(\d*))?([^#?]+)?(?:\?([^#]+))?(?:#(.+$))?!i';
preg_match ($r, Tools::getHttpHost(false, false), $out);
if (!preg_match ($r, Tools::getHttpHost(false, false), $out) || !isset($out[4]))
return false;
if (preg_match('/^(((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]{1}[0-9]|[1-9]).)'. if (preg_match('/^(((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]{1}[0-9]|[1-9]).)'.
'{1}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]).)'. '{1}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]).)'.
'{2}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]){1}))$/', $out[4])) '{2}((25[0-5]|2[0-4][0-9]|[1]{1}[0-9]{2}|[1-9]{1}[0-9]|[0-9]){1}))$/', $out[4]))
config/config.inc.php
+11 -6
View File
@@ -71,13 +71,18 @@ if (_PS_DEBUG_PROFILING_)
/* Redefine REQUEST_URI if empty (on some webservers...) */ /* Redefine REQUEST_URI if empty (on some webservers...) */
if (!isset($_SERVER['REQUEST_URI']) || empty($_SERVER['REQUEST_URI'])) if (!isset($_SERVER['REQUEST_URI']) || empty($_SERVER['REQUEST_URI']))
{ {
if (basename($_SERVER['SCRIPT_NAME']) == 'index.php' && empty($_SERVER['QUERY_STRING'])) if (!isset($_SERVER['SCRIPT_NAME']) && isset($_SERVER['SCRIPT_FILENAME']))
$_SERVER['REQUEST_URI'] = dirname($_SERVER['SCRIPT_NAME']).'/'; $_SERVER['SCRIPT_NAME'] = $_SERVER['SCRIPT_FILENAME'];
else if (isset($_SERVER['SCRIPT_NAME']))
{ {
$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME']; if (basename($_SERVER['SCRIPT_NAME']) == 'index.php' && empty($_SERVER['QUERY_STRING']))
if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) $_SERVER['REQUEST_URI'] = dirname($_SERVER['SCRIPT_NAME']).'/';
$_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING']; else
{
$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']))
$_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
}
} }
} }