[HttpFoundation] minor session-related fix

nicolas-grekas · nicolas-grekas · commit cf4eb4602ace · 2017-11-10T08:36:19.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/AbstractSessionHandler.php
@@ -32,7 +32,7 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess
     public function open($savePath, $sessionName)
     {
         $this->sessionName = $sessionName;
-        if (!headers_sent() && !ini_get('session.cache_limiter')) {
+        if (!headers_sent() && !ini_get('session.cache_limiter') && '0' !== ini_get('session.cache_limiter')) {
             header(sprintf('Cache-Control: max-age=%d, private, must-revalidate', 60 * (int) ini_get('session.cache_expire')));
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -60,7 +60,7 @@ class NativeSessionStorage implements SessionStorageInterface
      * ("auto_start", is not supported as it tells PHP to start a session before
      * PHP starts to execute user-land code. Setting during runtime has no effect).
      *
-     * cache_limiter, "private_no_expire" (use "0" to prevent headers from being sent entirely).
+     * cache_limiter, "" (use "0" to prevent headers from being sent entirely).
      * cache_expire, "0"
      * cookie_domain, ""
      * cookie_httponly, ""

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ abstract class AbstractSessionHandler implements \SessionHandlerInterface, \Sess`
`32`	`32`	`public function open($savePath, $sessionName)`
`33`	`33`	`{`
`34`	`34`	`$this->sessionName = $sessionName;`
`35`		`- if (!headers_sent() && !ini_get('session.cache_limiter')) {`
	`35`	`+ if (!headers_sent() && !ini_get('session.cache_limiter') && '0' !== ini_get('session.cache_limiter')) {`
`36`	`36`	`header(sprintf('Cache-Control: max-age=%d, private, must-revalidate', 60 * (int) ini_get('session.cache_expire')));`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class NativeSessionStorage implements SessionStorageInterface`
`60`	`60`	`* ("auto_start", is not supported as it tells PHP to start a session before`
`61`	`61`	`* PHP starts to execute user-land code. Setting during runtime has no effect).`
`62`	`62`	`*`
`63`		`- * cache_limiter, "private_no_expire" (use "0" to prevent headers from being sent entirely).`
	`63`	`+ * cache_limiter, "" (use "0" to prevent headers from being sent entirely).`
`64`	`64`	`* cache_expire, "0"`
`65`	`65`	`* cookie_domain, ""`
`66`	`66`	`* cookie_httponly, ""`