symfony
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
+3Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php
+3Lines changed: 3 additions & 0 deletions
@@ -70,6 +70,7 @@ private function setLocale(Request $request)
             $request->setLocale($locale);
         } elseif ($this->useAcceptLanguageHeader && $this->enabledLocales && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {
             $request->setLocale($preferredLanguage);
+            $request->attributes->set('_vary_by_language', true);
         }
     }
 
 
@@ -50,6 +50,9 @@ public function onKernelResponse(ResponseEvent $event)
 
         if ($this->addContentLanguageHeader && !$response->isInformational() && !$response->isEmpty() && !$response->headers->has('Content-Language')) {
             $response->headers->set('Content-Language', $event->getRequest()->getLocale());
+        }
+
+        if ($event->getRequest()->attributes->get('_vary_by_language')) {
             $response->setVary('Accept-Language', false);
         }
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ private function setLocale(Request $request)`
`70`	`70`	`$request->setLocale($locale);`
`71`	`71`	`} elseif ($this->useAcceptLanguageHeader && $this->enabledLocales && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {`
`72`	`72`	`$request->setLocale($preferredLanguage);`
	`73`	`+ $request->attributes->set('_vary_by_language', true);`
`73`	`74`	`}`
`74`	`75`	`}`
`75`	`76`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,9 @@ public function onKernelResponse(ResponseEvent $event)`
`50`	`50`
`51`	`51`	`if ($this->addContentLanguageHeader && !$response->isInformational() && !$response->isEmpty() && !$response->headers->has('Content-Language')) {`
`52`	`52`	`$response->headers->set('Content-Language', $event->getRequest()->getLocale());`
	`53`	`+ }`
	`54`	`+`
	`55`	`+ if ($event->getRequest()->attributes->get('_vary_by_language')) {`
`53`	`56`	`$response->setVary('Accept-Language', false);`
`54`	`57`	`}`
`55`	`58`