Merge branch '4.0'
* 4.0: Fix merge
This commit is contained in:
commit
882ffe9ee1
@ -327,7 +327,7 @@ EOF;
|
||||
$code .= <<<EOF
|
||||
\$requiredSchemes = $schemes;
|
||||
if (!isset(\$requiredSchemes[\$context->getScheme()])) {
|
||||
if (!in_array(\$this->context->getMethod(), array('HEAD', 'GET'))) {
|
||||
if ('GET' !== \$canonicalMethod) {
|
||||
\$allow[] = 'GET';
|
||||
goto $gotoname;
|
||||
}
|
||||
|
@ -347,7 +347,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
|
||||
$ret = array('_route' => 'secure');
|
||||
$requiredSchemes = array ( 'https' => 0,);
|
||||
if (!isset($requiredSchemes[$context->getScheme()])) {
|
||||
if (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
|
||||
if ('GET' !== $canonicalMethod) {
|
||||
$allow[] = 'GET';
|
||||
goto not_secure;
|
||||
}
|
||||
@ -364,7 +364,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
|
||||
$ret = array('_route' => 'nonsecure');
|
||||
$requiredSchemes = array ( 'http' => 0,);
|
||||
if (!isset($requiredSchemes[$context->getScheme()])) {
|
||||
if (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
|
||||
if ('GET' !== $canonicalMethod) {
|
||||
$allow[] = 'GET';
|
||||
goto not_nonsecure;
|
||||
}
|
||||
|
Reference in New Issue
Block a user