Update PHP session.cookie_samesite default value to match upstream

uselagoon · Sep 15, 2023 · abbbe5f · abbbe5f
1 parent 7ea9f7e
commit abbbe5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/helpers/TESTING_base_images_dockercompose.md b/helpers/TESTING_base_images_dockercompose.md
@@ -74,7 +74,7 @@ docker-compose exec -T commons sh -c "curl -kL http://php-8-0-dev:9000" | grep "
 docker-compose exec -T commons sh -c "curl -kL http://php-8-0-dev:9000" | grep "post_max_size" | grep "2048M"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-0-dev:9000" | grep "max_input_vars" | grep "2000"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-0-dev:9000" | grep "max_file_uploads" | grep "20"
-docker-compose exec -T commons sh -c "curl -kL http://php-8-0-dev:9000" | grep "session.cookie_samesite" | grep "None"
+docker-compose exec -T commons sh -c "curl -kL http://php-8-0-dev:9000" | grep "session.cookie_samesite" | grep "no value"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-0-dev:9000" | grep "display_errors" | grep "Off"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-0-dev:9000" | grep "date.timezone" | grep "UTC"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-0-dev:9000" | grep "opcache.memory_consumption" | grep "256"
@@ -115,7 +115,7 @@ docker-compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "
 docker-compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "post_max_size" | grep "2048M"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "max_input_vars" | grep "2000"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "max_file_uploads" | grep "20"
-docker-compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "session.cookie_samesite" | grep "None"
+docker-compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "session.cookie_samesite" | grep "no value"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "display_errors" | grep "Off"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "date.timezone" | grep "UTC"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-1-dev:9000" | grep "opcache.memory_consumption" | grep "256"
@@ -156,7 +156,7 @@ docker-compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "
 docker-compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "post_max_size" | grep "2048M"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "max_input_vars" | grep "2000"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "max_file_uploads" | grep "20"
-docker-compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "session.cookie_samesite" | grep "None"
+docker-compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "session.cookie_samesite" | grep "no value"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "display_errors" | grep "Off"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "date.timezone" | grep "UTC"
 docker-compose exec -T commons sh -c "curl -kL http://php-8-2-dev:9000" | grep "opcache.memory_consumption" | grep "256"

diff --git a/images/php-fpm/00-lagoon-php.ini.tpl b/images/php-fpm/00-lagoon-php.ini.tpl
@@ -31,7 +31,7 @@ session.gc_maxlifetime = 200000
 session.cookie_lifetime = 2000000
 session.cookie_secure = ${PHP_SESSION_COOKIE_SECURE:-0}
 session.cookie_httponly = ${PHP_SESSION_COOKIE_HTTPONLY:-0}
-session.cookie_samesite = ${PHP_SESSION_COOKIE_SAMESITE:-"None"}
+session.cookie_samesite = ${PHP_SESSION_COOKIE_SAMESITE:-}
 
 [opcache]
 opcache.memory_consumption = 256