diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[HttpFoundation] Fixed coding style, fixed wrong parameter method, added omitted split ip and added upper limit to the netmask ip

Browse Source
This commit is contained in:
Dominique Bongiraud 2010-11-16 19:45:19 +01:00 committed by Fabien Potencier
parent 14520d565b
commit 73daccd6c3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Symfony/Component/HttpFoundation/RequestMatcher.php
View File

@ -61,7 +61,13 @@ class RequestMatcher implements RequestMatcherInterface
*/
public function matchMethod($method)
{
$this->methods = array_map(function ($m) { return strtolower($m); }, is_array($method) ? $method : array($method));
$this->methods = array_map(
function ($m)
{
return strtolower($m);
},
is_array($method) ? $method : array($method)
);
}
/**
@ -98,7 +104,7 @@ class RequestMatcher implements RequestMatcherInterface
return false;
}
if (null !== $this->ip && !$this->checkIp($this->host, $request->getClientIp())) {
if (null !== $this->ip && !$this->checkIp($request->getClientIp())) {
return false;
}
@ -108,9 +114,9 @@ class RequestMatcher implements RequestMatcherInterface
protected function checkIp($ip)
{
if (false !== strpos($this->ip, '/')) {
list($address, $netmask) = $this->ip;
list($address, $netmask) = explode('/', $this->ip);
if ($netmask <= 0) {
if ($netmask < 1 || $netmask > 32) {
return false;
}
} else {