Skip to content

Commit 18cf248

Browse files
Merge branch '5.2' into 5.x
* 5.2: [HttpKernel] Configure `session.cookie_secure` earlier Make sure the Psalm review CI job is working Adding a Github action to run Psalm
2 parents 933b4cb + 54499ba commit 18cf248

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

Session/Storage/NativeSessionStorage.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,9 @@ public function setOptions(array $options)
389389
$this->emulateSameSite = $value;
390390
continue;
391391
}
392+
if ('cookie_secure' === $key && 'auto' === $value) {
393+
continue;
394+
}
392395
ini_set('url_rewriter.tags' !== $key ? 'session.'.$key : $key, $value);
393396
}
394397
}

0 commit comments

Comments
 (0)