Merge branch '4.0'

chalasr · chalasr · commit 28bf816e74b6 · 2017-12-12T12:47:36.000+01:00
* 4.0:
  add missing logout_on_user_change options
  [HttpFoundation] Add immutable to setCache's PHPDoc
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -913,7 +913,7 @@ public function setEtag(string $etag = null, bool $weak = false)
     /**
      * Sets the response's cache headers (validation and/or expiration).
      *
-     * Available options are: etag, last_modified, max_age, s_maxage, private, and public.
+     * Available options are: etag, last_modified, max_age, s_maxage, private, public and immutable.
      *
      * @return $this
      *

Original file line number	Diff line number	Diff line change
`@@ -913,7 +913,7 @@ public function setEtag(string $etag = null, bool $weak = false)`
`913`	`913`	`/**`
`914`	`914`	`* Sets the response's cache headers (validation and/or expiration).`
`915`	`915`	`*`
`916`		`- * Available options are: etag, last_modified, max_age, s_maxage, private, and public.`
	`916`	`+ * Available options are: etag, last_modified, max_age, s_maxage, private, public and immutable.`
`917`	`917`	`*`
`918`	`918`	`* @return $this`
`919`	`919`	`*`