summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2023-10-27 16:29:45 +0200
committerRemi Collet <remi@php.net>2023-10-27 16:29:45 +0200
commitf40e37b39f8c9e86e4bbec558f3b0c562f2f7590 (patch)
tree56ba68c6af4953794c11bc45bca9341aa29b5a51
parentd8e6761930f8fde62e4cf682950572fe20c2429b (diff)
refresh config with upstream
-rw-r--r--10-opcache.ini4
-rw-r--r--php.ini32
2 files changed, 7 insertions, 29 deletions
diff --git a/10-opcache.ini b/10-opcache.ini
index b6e6b0b..b3d4e6e 100644
--- a/10-opcache.ini
+++ b/10-opcache.ini
@@ -67,10 +67,6 @@ opcache.blacklist_filename=/etc/php.d/opcache*.blacklist
; are cached.
;opcache.max_file_size=0
-; Check the cache checksum each N requests.
-; The default value of "0" means that the checks are disabled.
-;opcache.consistency_checks=0
-
; How long to wait (in seconds) for a scheduled restart to begin if the cache
; is not being accessed.
;opcache.force_restart_timeout=180
diff --git a/php.ini b/php.ini
index 38b10a4..0b5f76d 100644
--- a/php.ini
+++ b/php.ini
@@ -75,7 +75,7 @@
; php.ini-production contains settings which hold security, performance and
; best practices at its core. But please be aware, these settings may break
-; compatibility with older or less security conscience applications. We
+; compatibility with older or less security-conscious applications. We
; recommending using the production ini in production and testing environments.
; php.ini-development is very similar to its production variant, except it is
@@ -1055,6 +1055,10 @@ sendmail_path = /usr/sbin/sendmail -t -i
; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename
mail.add_x_header = Off
+; Use mixed LF and CRLF line separators to keep compatibility with some
+; RFC 2822 non conformant MTA.
+mail.mixed_lf_and_crlf = Off
+
; The path to a log file that will log all mail() calls. Log entries include
; the full path of the script, line number, To address and headers.
;mail.log =
@@ -1152,9 +1156,6 @@ mysqli.default_user =
; https://php.net/mysqli.default-pw
mysqli.default_pw =
-; Allow or prevent reconnect
-mysqli.reconnect = Off
-
; If this option is enabled, closing a persistent connection will rollback
; any pending transactions of this connection, before it is put back
; into the persistent connection pool.
@@ -1489,33 +1490,14 @@ session.sid_bits_per_character = 5
; -1: Do not compile at all
; 0: Jump over assertion at run-time
; 1: Execute assertions
-; Changing from or to a negative value is only possible in php.ini! (For turning assertions on and off at run-time, see assert.active, when zend.assertions = 1)
+; Changing from or to a negative value is only possible in php.ini!
+; (For turning assertions on and off at run-time, toggle zend.assertions between the values 1 and 0)
; Default Value: 1
; Development Value: 1
; Production Value: -1
; https://php.net/zend.assertions
zend.assertions = -1
-; Assert(expr); active by default.
-; https://php.net/assert.active
-;assert.active = On
-
-; Throw an AssertionError on failed assertions
-; https://php.net/assert.exception
-;assert.exception = On
-
-; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active)
-; https://php.net/assert.warning
-;assert.warning = On
-
-; Don't bail out by default.
-; https://php.net/assert.bail
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-; https://php.net/assert.callback
-;assert.callback = 0
-
[mbstring]
; language for internal character representation.
; This affects mb_send_mail() and mbstring.detect_order.