diff -r d2e64e9b292d php.ini-development
--- a/php.ini-development Fri Mar 20 18:19:27 2020 +0100
+++ b/php.ini-development Fri Mar 20 18:23:03 2020 +0100
@@ -160,7 +160,7 @@
;user_ini.filename = ".user.ini"
; To disable this feature set this option to an empty value
-;user_ini.filename =
+user_ini.filename =
; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
;user_ini.cache_ttl = 300
@@ -184,7 +184,7 @@
; Development Value: Off
; Production Value: Off
; http://php.net/short-open-tag
-short_open_tag = Off
+short_open_tag = On
; The number of significant digits displayed in floating point numbers.
; http://php.net/precision
@@ -728,14 +728,9 @@
; Paths and Directories ;
;;;;;;;;;;;;;;;;;;;;;;;;;
-; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-;
; PHP's default setting for include_path is ".;/path/to/php/pear"
; http://php.net/include-path
+include_path = ".:/usr/lib/php/:/usr/share/pear/:/usr/share/php/"
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
@@ -754,7 +749,7 @@
; http://php.net/extension-dir
;extension_dir = "./"
; On windows:
-;extension_dir = "ext"
+extension_dir = "/usr/lib/php/extensions"
; Directory where the temporary files should be placed.
; Defaults to the system default (see sys_get_temp_dir)
@@ -835,11 +830,11 @@
; Temporary directory for HTTP uploaded files (will use system default if not
; specified).
; http://php.net/upload-tmp-dir
-;upload_tmp_dir =
+upload_tmp_dir = /var/tmp
; Maximum allowed size for uploaded files.
; http://php.net/upload-max-filesize
-upload_max_filesize = 2M
+upload_max_filesize = 16M
; Maximum number of files that can be uploaded via a single request
max_file_uploads = 20
@@ -900,49 +895,10 @@
; deprecated in a future PHP major version. So, when it is possible, please
; move to the new ('extension=<ext>) syntax.
;
-; Notes for Windows environments :
-;
-; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
-; extension folders as well as the separate PECL DLL download (PHP 5+).
-; Be sure to appropriately set the extension_dir directive.
-;
-;extension=bz2
-;extension=curl
-;extension=ffi
-;extension=ftp
-;extension=fileinfo
-;extension=gd2
-;extension=gettext
-;extension=gmp
-;extension=intl
-;extension=imap
-;extension=ldap
-;extension=mbstring
-;extension=exif ; Must be after mbstring as it depends on it
-;extension=mysqli
-;extension=oci8_12c ; Use with Oracle Database 12c Instant Client
-;extension=odbc
-;extension=openssl
-;extension=pdo_firebird
-;extension=pdo_mysql
-;extension=pdo_oci
-;extension=pdo_odbc
-;extension=pdo_pgsql
-;extension=pdo_sqlite
-;extension=pgsql
-;extension=shmop
-
-; The MIBS data available in the PHP distribution must be installed.
-; See http://www.php.net/manual/en/snmp.installation.php
-;extension=snmp
-
-;extension=soap
-;extension=sockets
-;extension=sodium
-;extension=sqlite3
-;extension=tidy
-;extension=xmlrpc
-;extension=xsl
+; In Mageia, we don't add the extensions in php.ini anymore, we put
+; them in /etc/php.d/<number>_<name>.ini, for example 10_recode.ini.
+; This is so that the RPMS can register themselves without having to
+; modify the php.ini file.
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
@@ -1335,7 +1291,7 @@
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
; http://php.net/session.save-path
-;session.save_path = "/tmp"
+session.save_path = "/var/lib/php"
; Whether to use strict session mode.
; Strict session mode does not accept an uninitialized session ID, and
@@ -1401,7 +1357,12 @@
; Development Value: 1
; Production Value: 1
; http://php.net/session.gc-probability
-session.gc_probability = 1
+
+; This is disabled in the Mageia Linux packages, due to the strict permissions
+; on /var/lib/php. Instead of setting this here, see the cronjob at
+; /etc/cron.d/php, which uses the session.gc_maxlifetime settings from the
+; /etc/php.d/*_session.ini file.
+session.gc_probability = 0
; Defines the probability that the 'garbage collection' process is started on every
; session initialization. The probability is calculated by using gc_probability/gc_divisor,
@@ -1740,7 +1701,7 @@
; Sets the directory name where SOAP extension will put cache files.
; http://php.net/soap.wsdl-cache-dir
-soap.wsdl_cache_dir="/tmp"
+soap.wsdl_cache_dir="/var/tmp"
; (time to live) Sets the number of second while cached file will be used
; instead of original one.
diff -r d2e64e9b292d php.ini-production
--- a/php.ini-production Fri Mar 20 18:19:27 2020 +0100
+++ b/php.ini-production Fri Mar 20 18:23:03 2020 +0100
@@ -160,7 +160,7 @@
;user_ini.filename = ".user.ini"
; To disable this feature set this option to an empty value
-;user_ini.filename =
+user_ini.filename =
; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
;user_ini.cache_ttl = 300
@@ -184,7 +184,7 @@
; Development Value: Off
; Production Value: Off
; http://php.net/short-open-tag
-short_open_tag = Off
+short_open_tag = On
; The number of significant digits displayed in floating point numbers.
; http://php.net/precision
@@ -732,14 +732,9 @@
; Paths and Directories ;
;;;;;;;;;;;;;;;;;;;;;;;;;
-; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-;
; PHP's default setting for include_path is ".;/path/to/php/pear"
; http://php.net/include-path
+include_path = ".:/usr/lib/php/:/usr/share/pear/:/usr/share/php/"
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
@@ -758,7 +753,7 @@
; http://php.net/extension-dir
;extension_dir = "./"
; On windows:
-;extension_dir = "ext"
+extension_dir = ""/usr/lib/php/extensions
; Directory where the temporary files should be placed.
; Defaults to the system default (see sys_get_temp_dir)
@@ -839,11 +834,11 @@
; Temporary directory for HTTP uploaded files (will use system default if not
; specified).
; http://php.net/upload-tmp-dir
-;upload_tmp_dir =
+upload_tmp_dir = /var/tmp
; Maximum allowed size for uploaded files.
; http://php.net/upload-max-filesize
-upload_max_filesize = 2M
+upload_max_filesize = 16M
; Maximum number of files that can be uploaded via a single request
max_file_uploads = 20
@@ -904,49 +899,10 @@
; deprecated in a future PHP major version. So, when it is possible, please
; move to the new ('extension=<ext>) syntax.
;
-; Notes for Windows environments :
-;
-; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
-; extension folders as well as the separate PECL DLL download (PHP 5+).
-; Be sure to appropriately set the extension_dir directive.
-;
-;extension=bz2
-;extension=curl
-;extension=ffi
-;extension=ftp
-;extension=fileinfo
-;extension=gd2
-;extension=gettext
-;extension=gmp
-;extension=intl
-;extension=imap
-;extension=ldap
-;extension=mbstring
-;extension=exif ; Must be after mbstring as it depends on it
-;extension=mysqli
-;extension=oci8_12c ; Use with Oracle Database 12c Instant Client
-;extension=odbc
-;extension=openssl
-;extension=pdo_firebird
-;extension=pdo_mysql
-;extension=pdo_oci
-;extension=pdo_odbc
-;extension=pdo_pgsql
-;extension=pdo_sqlite
-;extension=pgsql
-;extension=shmop
-
-; The MIBS data available in the PHP distribution must be installed.
-; See http://www.php.net/manual/en/snmp.installation.php
-;extension=snmp
-
-;extension=soap
-;extension=sockets
-;extension=sodium
-;extension=sqlite3
-;extension=tidy
-;extension=xmlrpc
-;extension=xsl
+; In Mageia, we don't add the extensions in php.ini anymore, we put
+; them in /etc/php.d/<number>_<name>.ini, for example 10_recode.ini.
+; This is so that the RPMS can register themselves without having to
+; modify the php.ini file.
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
@@ -1339,7 +1295,7 @@
; where MODE is the octal representation of the mode. Note that this
; does not overwrite the process's umask.
; http://php.net/session.save-path
-;session.save_path = "/tmp"
+session.save_path = "/var/lib/php"
; Whether to use strict session mode.
; Strict session mode does not accept an uninitialized session ID, and
@@ -1405,7 +1361,12 @@
; Development Value: 1
; Production Value: 1
; http://php.net/session.gc-probability
-session.gc_probability = 1
+
+; This is disabled in the Mageia Linux packages, due to the strict permissions
+; on /var/lib/php. Instead of setting this here, see the cronjob at
+; /etc/cron.d/php, which uses the session.gc_maxlifetime settings from the
+; /etc/php.d/*_session.ini file.
+session.gc_probability = 0
; Defines the probability that the 'garbage collection' process is started on every
; session initialization. The probability is calculated by using gc_probability/gc_divisor,
@@ -1742,7 +1703,7 @@
; Sets the directory name where SOAP extension will put cache files.
; http://php.net/soap.wsdl-cache-dir
-soap.wsdl_cache_dir="/tmp"
+soap.wsdl_cache_dir="/var/tmp"
; (time to live) Sets the number of second while cached file will be used
; instead of original one.
