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

[Routing] Prevent some double match of hosts

Browse Source
This commit is contained in:
Nicolas Grekas 2018-02-22 09:25:05 +01:00
parent 7b8934baba
commit 8e207cda80
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
View File

@ -239,7 +239,7 @@ EOF;
$code .= sprintf(" case %s:\n", self::export($url)); $code .= sprintf(" case %s:\n", self::export($url));
foreach ($routes as $name => list($hasTrailingSlash, $route)) { foreach ($routes as $name => list($hasTrailingSlash, $route)) {
$code .= $this->compileRoute($route, $name, $supportsRedirections, $hasTrailingSlash); $code .= $this->compileRoute($route, $name, $supportsRedirections, $hasTrailingSlash, true);
} }
$code .= " break;\n"; $code .= " break;\n";
} }
@ -451,7 +451,7 @@ EOF;
$hasTrailingSlash = $state->supportsRedirections && '' !== $regex && '/' === $regex[-1]; $hasTrailingSlash = $state->supportsRedirections && '' !== $regex && '/' === $regex[-1];
if ($compiledRoute->getRegex() === $prevRegex) { if ($compiledRoute->getRegex() === $prevRegex) {
$state->switch = substr_replace($state->switch, $this->compileRoute($route, $name, $state->supportsRedirections, $hasTrailingSlash)."\n", -19, 0); $state->switch = substr_replace($state->switch, $this->compileRoute($route, $name, $state->supportsRedirections, $hasTrailingSlash, false)."\n", -19, 0);
continue; continue;
} }
@ -485,7 +485,7 @@ EOF;
$state->switch .= <<<EOF $state->switch .= <<<EOF
case {$state->mark}: case {$state->mark}:
{$combine}{$this->compileRoute($route, $name, $state->supportsRedirections, $hasTrailingSlash)} {$combine}{$this->compileRoute($route, $name, $state->supportsRedirections, $hasTrailingSlash, false)}
break; break;
EOF; EOF;
@ -572,16 +572,9 @@ EOF;
/** /**
* Compiles a single Route to PHP code used to match it against the path info. * Compiles a single Route to PHP code used to match it against the path info.
* *
* @param Route $route A Route instance
* @param string $name The name of the Route
* @param bool $supportsRedirections Whether redirections are supported by the base class
* @param bool $hasTrailingSlash Whether the path has a trailing slash
*
* @return string PHP code
*
* @throws \LogicException * @throws \LogicException
*/ */
private function compileRoute(Route $route, string $name, bool $supportsRedirections, bool $hasTrailingSlash): string private function compileRoute(Route $route, string $name, bool $supportsRedirections, bool $hasTrailingSlash, bool $checkHost): string
{ {
$code = ''; $code = '';
$compiledRoute = $route->compile(); $compiledRoute = $route->compile();
@ -605,7 +598,7 @@ EOF;
$conditions[] = $expression; $conditions[] = $expression;
} }
if (!$compiledRoute->getHostRegex()) { if (!$checkHost || !$compiledRoute->getHostRegex()) {
// no-op // no-op
} elseif ($hostMatches) { } elseif ($hostMatches) {
$conditions[] = sprintf('preg_match(%s, $host, $hostMatches)', self::export($compiledRoute->getHostRegex())); $conditions[] = sprintf('preg_match(%s, $host, $hostMatches)', self::export($compiledRoute->getHostRegex()));