diff --git a/EventListener/AbstractSessionListener.php b/EventListener/AbstractSessionListener.php
index 76c2064d18..5f657bfbdf 100644
--- a/EventListener/AbstractSessionListener.php
+++ b/EventListener/AbstractSessionListener.php
@@ -74,7 +74,7 @@ public function onKernelResponse(FilterResponseEvent $event)
// Always remove the internal header if present
$response->headers->remove(self::NO_AUTO_CACHE_CONTROL_HEADER);
- if (!$session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : $event->getRequest()->getSession()) {
+ if (!$session = $this->container && $this->container->has('initialized_session') ? $this->container->get('initialized_session') : ($event->getRequest()->hasSession() ? $event->getRequest()->getSession() : null)) {
return;
}
diff --git a/Kernel.php b/Kernel.php
index 8c5765cc05..46838909f9 100644
--- a/Kernel.php
+++ b/Kernel.php
@@ -76,11 +76,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
private static $freshCache = [];
- public const VERSION = '4.4.41';
- public const VERSION_ID = 40441;
+ public const VERSION = '4.4.42';
+ public const VERSION_ID = 40442;
public const MAJOR_VERSION = 4;
public const MINOR_VERSION = 4;
- public const RELEASE_VERSION = 41;
+ public const RELEASE_VERSION = 42;
public const EXTRA_VERSION = '';
public const END_OF_MAINTENANCE = '11/2022';
diff --git a/Tests/EventListener/SessionListenerTest.php b/Tests/EventListener/SessionListenerTest.php
index d6ff42f926..9b49936f46 100644
--- a/Tests/EventListener/SessionListenerTest.php
+++ b/Tests/EventListener/SessionListenerTest.php
@@ -139,6 +139,24 @@ public function testUninitializedSession()
$this->assertFalse($response->headers->has(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER));
}
+ public function testUninitializedSessionWithoutInitializedSession()
+ {
+ $kernel = $this->createMock(HttpKernelInterface::class);
+ $response = new Response();
+ $response->setSharedMaxAge(60);
+ $response->headers->set(AbstractSessionListener::NO_AUTO_CACHE_CONTROL_HEADER, 'true');
+
+ $container = new ServiceLocator([]);
+
+ $listener = new SessionListener($container);
+ $listener->onKernelResponse(new ResponseEvent($kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $response));
+ $this->assertFalse($response->headers->has('Expires'));
+ $this->assertTrue($response->headers->hasCacheControlDirective('public'));
+ $this->assertFalse($response->headers->hasCacheControlDirective('private'));
+ $this->assertFalse($response->headers->hasCacheControlDirective('must-revalidate'));
+ $this->assertSame('60', $response->headers->getCacheControlDirective('s-maxage'));
+ }
+
public function testSurrogateMasterRequestIsPublic()
{
$session = $this->createMock(Session::class);
diff --git a/Tests/Fragment/InlineFragmentRendererTest.php b/Tests/Fragment/InlineFragmentRendererTest.php
index c22a426d7d..69bd7445ac 100644
--- a/Tests/Fragment/InlineFragmentRendererTest.php
+++ b/Tests/Fragment/InlineFragmentRendererTest.php
@@ -155,7 +155,7 @@ public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
$this->assertEquals('Foo', ob_get_clean());
}
- public function testLocaleAndFormatAreIsKeptInSubrequest()
+ public function testLocaleAndFormatAreKeptInSubrequest()
{
$expectedSubRequest = Request::create('/');
$expectedSubRequest->attributes->set('_format', 'foo');
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy