symfony
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
+6-2Lines changed: 6 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/AbstractTestSessionListener.php
+6-2Lines changed: 6 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
+25Lines changed: 25 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/EventListener/TestSessionListenerTest.php
+25Lines changed: 25 additions & 0 deletions
@@ -29,6 +29,8 @@
  */
 abstract class AbstractTestSessionListener implements EventSubscriberInterface
 {
+    private $sessionId;
+
     public function onKernelRequest(GetResponseEvent $event)
     {
         if (!$event->isMasterRequest()) {
@@ -44,7 +46,8 @@ public function onKernelRequest(GetResponseEvent $event)
         $cookies = $event->getRequest()->cookies;
 
         if ($cookies->has($session->getName())) {
-            $session->setId($cookies->get($session->getName()));
+            $this->sessionId = $cookies->get($session->getName());
+            $session->setId($this->sessionId);
         }
     }
 
@@ -66,9 +69,10 @@ public function onKernelResponse(FilterResponseEvent $event)
             $session->save();
         }
 
-        if ($session instanceof Session ? !$session->isEmpty() : $wasStarted) {
+        if ($session instanceof Session ? !$session->isEmpty() || $session->getId() !== $this->sessionId : $wasStarted) {
             $params = session_get_cookie_params();
             $event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));
+            $this->sessionId = $session->getId();
         }
     }
 
 
@@ -13,8 +13,10 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
+use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\EventListener\SessionListener;
@@ -86,6 +88,22 @@ public function testEmptySessionDoesNotSendCookie()
         $this->assertSame(array(), $response->headers->getCookies());
     }
 
+    public function testEmptySessionWithNewSessionIdDoesSendCookie()
+    {
+        $this->sessionHasBeenStarted();
+        $this->sessionIsEmpty();
+        $this->fixSessionId('456');
+
+        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $request = Request::create('/', 'GET', array(), array(new Cookie('MOCKSESSID', '123')));
+        $event = new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+        $this->listener->onKernelRequest($event);
+
+        $response = $this->filterResponse(new Request(), HttpKernelInterface::MASTER_REQUEST);
+
+        $this->assertNotEmpty($response->headers->getCookies());
+    }
+
     public function testUnstartedSessionIsNotSave()
     {
         $this->sessionHasNotBeenStarted();
@@ -150,6 +168,13 @@ private function sessionIsEmpty()
             ->will($this->returnValue(true));
     }
 
+    private function fixSessionId($sessionId)
+    {
+        $this->session->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($sessionId));
+    }
+
     private function getSession()
     {
         $mock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Session\Session')
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`	`*/`
`30`	`30`	`abstract class AbstractTestSessionListener implements EventSubscriberInterface`
`31`	`31`	`{`
	`32`	`+ private $sessionId;`
	`33`	`+`
`32`	`34`	`public function onKernelRequest(GetResponseEvent $event)`
`33`	`35`	`{`
`34`	`36`	`if (!$event->isMasterRequest()) {`
`@@ -44,7 +46,8 @@ public function onKernelRequest(GetResponseEvent $event)`
`44`	`46`	`$cookies = $event->getRequest()->cookies;`
`45`	`47`
`46`	`48`	`if ($cookies->has($session->getName())) {`
`47`		`- $session->setId($cookies->get($session->getName()));`
	`49`	`+ $this->sessionId = $cookies->get($session->getName());`
	`50`	`+ $session->setId($this->sessionId);`
`48`	`51`	`}`
`49`	`52`	`}`
`50`	`53`
`@@ -66,9 +69,10 @@ public function onKernelResponse(FilterResponseEvent $event)`
`66`	`69`	`$session->save();`
`67`	`70`	`}`
`68`	`71`
`69`		`- if ($session instanceof Session ? !$session->isEmpty() : $wasStarted) {`
	`72`	`+ if ($session instanceof Session ? !$session->isEmpty() \|\| $session->getId() !== $this->sessionId : $wasStarted) {`
`70`	`73`	`$params = session_get_cookie_params();`
`71`	`74`	`$event->getResponse()->headers->setCookie(new Cookie($session->getName(), $session->getId(), 0 === $params['lifetime'] ? 0 : time() + $params['lifetime'], $params['path'], $params['domain'], $params['secure'], $params['httponly']));`
	`75`	`+ $this->sessionId = $session->getId();`
`72`	`76`	`}`
`73`	`77`	`}`
`74`	`78`