Commitafab34d

committed

[HttpKernel] fix sending Vary: Accept-Language when appropriate

1 parent4a07e06 commitafab34dCopy full SHA for afab34d

File tree

-0

lines changed

src/Symfony/Component/HttpKernel/EventListener
- LocaleListener.php
- ResponseListener.php

-0

lines changed

Lines changed: 1 addition & 0 deletions

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`

Lines changed: 3 additions & 0 deletions

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`

Comments

(0)