From: Marcin Krol Date: Fri, 13 Dec 2019 23:06:25 +0000 (+0100) Subject: - don't enable browscap.ini by default X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=1f85a762ba3fcc170fef16ffb7f42bbc65241a56;p=packages%2Fphp.git - don't enable browscap.ini by default - update php.ini description --- diff --git a/php-ini.patch b/php-ini.patch index be75347..a0ec98f 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,23 +1,19 @@ --- php-7.2.1/php.ini 2018-01-02 22:36:07.000000000 +0000 +++ php-7.2.1/php.ini 2018-01-07 18:48:58.353614413 +0000 -@@ -82,6 +82,20 @@ +@@ -82,6 +82,16 @@ ; much more verbose when it comes to errors. We recommend using the ; development version only in development environments, as errors shown to ; application users can inadvertently leak otherwise secure information. +; -+; This is the default settings file for new PHP installations from -+; TLD Linux. ++; This is the default settings file for new PHP installations on TLD Linux. +; -+; It's based mainly on php.ini-production, but with some changes made with -+; security in mind (see below, consult also http://php.net/manual/en/security.php). ++; It is based mainly on php.ini-production, but with some changes made with ++; security in mind (http://php.net/manual/en/security.php). +; -+; Please note, that in TLD installations /etc/php72/php.ini file -+; contains global settings for all SAPIs (cgi, cli, apache...), -+; and after reading this file, SAPI-specific file (/etc/php72/php-cgi-fcgi.ini, -+; /etc/php72/php-cli.ini, /etc/php72/php-apache.ini...) is INCLUDED -+; (so you don't have to duplicate whole large file to override only -+; few options) -+ ++; Please note, that in TLD Linux file /etc/php74/php.ini contains global ++; settings for all SAPIs (cgi, cli, apache...), and after reading this file ++; SAPI-specific file is included so you don't have to duplicate whole large ++; file to override only few options. ; This is php.ini-production INI file. @@ -165,15 +161,6 @@ ; Default host for mysql_connect() (doesn't apply in safe mode). ; http://php.net/mysqli.default-host mysqli.default_host = -@@ -1314,7 +1272,7 @@ - - [browscap] - ; http://php.net/browscap --;browscap = extra/browscap.ini -+browscap = /etc/php/browscap.ini - - [Session] - ; Handler used to store/retrieve data. @@ -1741,7 +1699,7 @@ ; Sets the directory name where SOAP extension will put cache files.