Session: don't call session_set_cookie_params() when values was not c…

…hanged [Closes #134][Closes #23]
nette · Mar 14, 2018 · 3ea16d9 · 3ea16d9
1 parent b852132
commit 3ea16d9
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/Http/Session.php b/src/Http/Session.php
@@ -373,15 +373,13 @@ public function getOptions(): array
 	private function configure(array $config): void
 	{
 		$special = ['cache_expire' => 1, 'cache_limiter' => 1, 'save_path' => 1, 'name' => 1];
+		$cookie = $origCookie = session_get_cookie_params();
 
 		foreach ($config as $key => $value) {
 			if ($value === null || ini_get("session.$key") == $value) { // intentionally ==
 				continue;
 
 			} elseif (strncmp($key, 'cookie_', 7) === 0) {
-				if (!isset($cookie)) {
-					$cookie = session_get_cookie_params();
-				}
 				$cookie[substr($key, 7)] = $value;
 
 			} else {
@@ -401,7 +399,7 @@ private function configure(array $config): void
 			}
 		}
 
-		if (isset($cookie)) {
+		if ($cookie !== $origCookie) {
 			session_set_cookie_params(
 				$cookie['lifetime'], $cookie['path'], $cookie['domain'],
 				$cookie['secure'], $cookie['httponly']