From 1d1bc1bc9645b3f6b4d76cfa2d5a320455fa3ee6 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 14 Dec 2019 00:02:20 +0100 Subject: [PATCH] - don't enable browscap.ini by default, PHP 7.4 will fail to run if browscap.ini is enabled but missing - updated php.ini description --- php-ini.patch | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/php-ini.patch b/php-ini.patch index 5a71310..3d37fd8 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,23 +1,19 @@ --- php-7.4.0/php.ini 2019-11-26 21:13:36.000000000 +0100 +++ php-7.4.0/php.ini 2019-12-13 00:49:46.186000000 +0100 -@@ -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/php74/php.ini file -+; contains global settings for all SAPIs (cgi, cli, apache...), -+; and after reading this file, SAPI-specific file (/etc/php74/php-cgi-fcgi.ini, -+; /etc/php74/php-cli.ini, /etc/php74/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 the php.ini-production INI file. @@ -164,15 +160,6 @@ ; Default host for mysqli_connect() (doesn't apply in safe mode). ; http://php.net/mysqli.default-host mysqli.default_host = -@@ -1304,7 +1263,7 @@ - - [browscap] - ; http://php.net/browscap --;browscap = extra/browscap.ini -+browscap = /etc/php/browscap.ini - - [Session] - ; Handler used to store/retrieve data. @@ -1748,7 +1707,7 @@ ; Sets the directory name where SOAP extension will put cache files. -- 2.46.0