refresh configuration, from upstream

2 files changed, 25 insertions, 1 deletions

diff --git a/10-opcache.ini b/10-opcache.ini
index b24b410..60e54b8 100644
--- a/10-opcache.ini
+++ b/10-opcache.ini
@@ -49,7 +49,8 @@ opcache.max_accelerated_files=4000
 ; passes
 ;opcache.optimization_level=0x7FFFBFFF
 
-;opcache.inherited_hack=1
+; This hack should only be enabled to work around "Cannot redeclare class"
+; errors.
 ;opcache.dups_fix=0
 
 ; The location of the OPcache blacklist file (wildcards allowed).
diff --git a/php.ini b/php.ini
index a5ad3a1..821b31e 100644
--- a/php.ini
+++ b/php.ini
@@ -585,6 +585,24 @@ html_errors = On
 ; Log errors to syslog (Event Log on Windows).
 ;error_log = syslog
 
+; The syslog ident is a string which is prepended to every message logged
+; to syslog. Only used when error_log is set to syslog.
+;syslog.ident = php
+
+; The syslog facility is used to specify what type of program is logging 
+; the message. Only used when error_log is set to syslog.
+;syslog.facility = user
+
+; Set this to disable filtering control characters (the default).
+; Some loggers only accept NVT-ASCII, others accept anything that's not
+; control characters. If your logger accepts everything, then no filtering
+; is needed at all.
+; Allowed values are:
+;   ascii (only base ASCII characters)
+;   no_ctrl (all characters except control characters)
+;   all (all characters)
+;syslog.filter = ascii
+
 ;windows.show_crt_warning
 ; Default value: 0
 ; Development value: 0
@@ -1282,6 +1300,11 @@ session.cookie_domain =
 ; http://php.net/session.cookie-httponly
 session.cookie_httponly =
 
+; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF)
+; Current valid values are "Lax" or "Strict"
+; https://tools.ietf.org/html/draft-west-first-party-cookies-07
+session.cookie_samesite =
+
 ; Handler used to serialize data. php is the standard serializer of PHP.
 ; http://php.net/session.serialize-handler
 session.serialize_handler = php