Skip to content

Commit 10bf541

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Clarify session.cookie_samesite="None"
2 parents ba6834f + c00cce3 commit 10bf541

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

php.ini-development

+2-1
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,8 @@ session.cookie_domain =
13861386
session.cookie_httponly =
13871387

13881388
; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF)
1389-
; Current valid values are "Lax" or "Strict"
1389+
; Current valid values are "Strict", "Lax" or "None". When using "None",
1390+
; make sure to include the quotes, as `none` is interpreted like `false` in ini files.
13901391
; https://tools.ietf.org/html/draft-west-first-party-cookies-07
13911392
session.cookie_samesite =
13921393

php.ini-production

+2-1
Original file line numberDiff line numberDiff line change
@@ -1390,7 +1390,8 @@ session.cookie_domain =
13901390
session.cookie_httponly =
13911391

13921392
; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF)
1393-
; Current valid values are "Lax" or "Strict"
1393+
; Current valid values are "Strict", "Lax" or "None". When using "None",
1394+
; make sure to include the quotes, as `none` is interpreted like `false` in ini files.
13941395
; https://tools.ietf.org/html/draft-west-first-party-cookies-07
13951396
session.cookie_samesite =
13961397

0 commit comments

Comments
 (0)