Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 506afc7db5c6 · 2019-12-07T17:25:26.000+01:00
* 3.4:
  [Cache] fix memory leak when using PhpArrayAdapter
  fix parsing negative octal numbers
  [SecurityBundle] Properly escape regex in AddSessionDomainConstraintPass
  [Config] never try loading failed classes twice with ClassExistenceResource
diff --git a/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php b/DependencyInjection/Compiler/AddSessionDomainConstraintPass.php
@@ -31,7 +31,7 @@ public function process(ContainerBuilder $container)
         }
 
         $sessionOptions = $container->getParameter('session.storage.options');
-        $domainRegexp = empty($sessionOptions['cookie_domain']) ? '%s' : sprintf('(?:%%s|(?:.+\.)?%s)', preg_quote(trim($sessionOptions['cookie_domain'], '.')));
+        $domainRegexp = empty($sessionOptions['cookie_domain']) ? '%%s' : sprintf('(?:%%%%s|(?:.+\.)?%s)', preg_quote(trim($sessionOptions['cookie_domain'], '.')));
 
         if ('auto' === ($sessionOptions['cookie_secure'] ?? null)) {
             $secureDomainRegexp = sprintf('{^https://%s$}i', $domainRegexp);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function process(ContainerBuilder $container)`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`$sessionOptions = $container->getParameter('session.storage.options');`
`34`		`- $domainRegexp = empty($sessionOptions['cookie_domain']) ? '%s' : sprintf('(?:%%s\|(?:.+\.)?%s)', preg_quote(trim($sessionOptions['cookie_domain'], '.')));`
	`34`	`+ $domainRegexp = empty($sessionOptions['cookie_domain']) ? '%%s' : sprintf('(?:%%%%s\|(?:.+\.)?%s)', preg_quote(trim($sessionOptions['cookie_domain'], '.')));`
`35`	`35`
`36`	`36`	`if ('auto' === ($sessionOptions['cookie_secure'] ?? null)) {`
`37`	`37`	`$secureDomainRegexp = sprintf('{^https://%s$}i', $domainRegexp);`