From bd9e730043898b8b3d5d274d08002c1215a7e2bb Mon Sep 17 00:00:00 2001
From: James Deathe <james.deathe@gmail.com>
Date: Sat, 27 Jul 2019 14:47:08 +0100
Subject: [PATCH] #220: Adds default PHP session settings into service.

---
 CHANGELOG.md |  1 +
 Dockerfile   | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6026511..94632c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ Summary of release changes.
 ### 2.2.1 - Unreleased
 
 - Adds setting PHP `date.timezone` to `PHP_OPTIONS_DATE_TIMEZONE` into service configuration; removes dependency on app package configuration.
+- Adds session PHP settings into service configuration; removes dependency on app package configuration.
 
 ### 2.2.0 - 2019-07-20
 
diff --git a/Dockerfile b/Dockerfile
index 14516c2..19bb434 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -163,15 +163,19 @@ RUN useradd -r -M -d /var/www/app -s /sbin/nologin app \
 		/etc/php.ini \
 		> /etc/php.d/00-php.ini.default \
 	&& sed -r \
-		-e 's~^;(user_ini.filename =)$~\1~g' \
-		-e 's~^;(cgi.fix_pathinfo=1)$~\1~g' \
+		-e 's~^;?(cgi.fix_pathinfo( )?=).*$~\1\21~g' \
 		-e 's~^;?(date.timezone( )?=).*$~\1\2"${PHP_OPTIONS_DATE_TIMEZONE:-UTC}"~g' \
-		-e 's~^(expose_php = )On$~\1Off~g' \
-		-e 's~^;(realpath_cache_size = ).*$~\14096k~' \
-		-e 's~^;(realpath_cache_ttl = ).*$~\1600~' \
-		-e 's~^;?(session.name = ).*$~\1"${PHP_OPTIONS_SESSION_NAME:-PHPSESSID}"~' \
-		-e 's~^;?(session.save_handler = ).*$~\1"${PHP_OPTIONS_SESSION_SAVE_HANDLER:-files}"~' \
-		-e 's~^;?(session.save_path = ).*$~\1"${PHP_OPTIONS_SESSION_SAVE_PATH:-/var/lib/php/session}"~' \
+		-e 's~^;?(expose_php( )?=).*$~\1\2Off~g' \
+		-e 's~^;?(realpath_cache_size( )?=).*$~\1\24096k~' \
+		-e 's~^;?(realpath_cache_ttl( )?=).*$~\1\2600~' \
+		-e 's~^;?(session.cookie_httponly( )?=).*$~\1\21~' \
+		-e 's~^;?(session.name( )?=).*$~\1\2"${PHP_OPTIONS_SESSION_NAME:-PHPSESSID}"~' \
+		-e 's~^;?(session.save_handler( )?=).*$~\1\2"${PHP_OPTIONS_SESSION_SAVE_HANDLER:-files}"~' \
+		-e 's~^;?(session.save_path( )?=).*$~\1\2"${PHP_OPTIONS_SESSION_SAVE_PATH:-/var/lib/php/session}"~' \
+		-e 's~^;?(session.sid_bits_per_character( )?=).*$~\1\25~' \
+		-e 's~^;?(session.sid_length( )?=).*$~\1\264~' \
+		-e 's~^;?(session.use_strict_mode( )?=).*$~\1\21~' \
+		-e 's~^;?(user_ini.filename( )?=).*$~\1~g' \
 		/etc/php.d/00-php.ini.default \
 		> /etc/php.d/00-php.ini \
 	&& sed \