mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 10:33:18 +01:00
Code Issues Releases Wiki Activity

#377 fix the issue in matchDomain method

Browse Source
This commit is contained in:
Andy Hu 2013-07-13 18:59:30 +08:00
parent 1f33485b6e
commit 49ad50059a
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/Guzzle/Plugin/Cookie/Cookie.php
View File

@ -426,32 +426,23 @@ class Cookie implements ToArrayInterface
{
$cookieDomain = $this->getDomain();
// Remove the leading '.' as per spec in RFC 6265:
// http://tools.ietf.org/html/rfc6265#section-5.2.3
if($cookieDomain && substr($cookieDomain, 0, 1) == '.') {
$cookieDomain = substr($cookieDomain, 1);
}
// Domain not set or exact match.
if (!$cookieDomain || !strcasecmp($domain, $cookieDomain)) {
return true;
}
// . prefix match.
if (strpos($cookieDomain, '.') === 0) {
$realDomain = substr($cookieDomain, 1);
// Root domains don't match except for .local.
if (!substr_count($realDomain, '.') && strcasecmp($realDomain, 'local')) {
return false;
}
if (filter_var($domain, FILTER_VALIDATE_IP)) {
return false;
}
if (substr($domain, -strlen($realDomain)) === $realDomain) {
// Match exact or 1 deep subdomain.
return !strcasecmp($domain, $realDomain) ||
substr_count(substr($domain, 0, -strlen($realDomain)), '.') === 1;
}
// Matching the subdomain according to RFC 6265:
// http://tools.ietf.org/html/rfc6265#section-5.1.3
if (filter_var($domain, FILTER_VALIDATE_IP)) {
return false;
}
return false;
return preg_match('/\.' . preg_quote($cookieDomain) . '$/i', $domain);
}
/**