- updated to 7.4.0, partial PLD merge, release 0.1 (not tested yet)

[packages/php.git] / php-ini.patch

diff --git a/php-ini.patch b/php-ini.patch
index dd260eb635629c367a5cb769f07247b8563c2774..5a713102cc98427bf4b4160f2d23b82afbcbd818 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-7.3.0/php.ini  2018-12-04 16:12:20.000000000 +0000
-+++ php-7.3.0/php.ini  2018-12-07 16:18:48.333403000 +0000
+--- 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 @@
  ; much more verbose when it comes to errors. We recommend using the
  ; development version only in development environments, as errors shown to
@@ -11,17 +11,17 @@
 +; 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).
 +;
-+; Please note, that in TLD installations /etc/php/php.ini file
++; 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/php/php-cgi-fcgi.ini,
-+; /etc/php/php-cli.ini, /etc/php/php-apache.ini...) is INCLUDED
++; 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)
 +
  
  ; This is the php.ini-production INI file.
  
-@@ -149,7 +163,7 @@
+@@ -144,7 +158,7 @@
  ;   Production Value: 5
  
  ; short_open_tag
@@ -30,7 +30,7 @@
  ;   Development Value: Off
  ;   Production Value: Off
  
-@@ -170,7 +184,7 @@
+@@ -160,7 +174,7 @@
  ;user_ini.filename = ".user.ini"
  
  ; To disable this feature set this option to an empty value
@@ -39,7 +39,7 @@
  
  ; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
  ;user_ini.cache_ttl = 300
-@@ -190,7 +204,7 @@
+@@ -180,7 +194,7 @@
  ; documents, however this remains supported for backward compatibility reasons.
  ; Note that this directive does not control the <?= shorthand tag, which can be
  ; used regardless of this directive.
@@ -48,7 +48,7 @@
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -371,7 +385,7 @@
+@@ -376,7 +390,7 @@
  ; threat in any way, but it makes it possible to determine whether you use PHP
  ; on your server or not.
  ; http://php.net/expose-php
@@ -57,7 +57,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -752,7 +766,7 @@
+@@ -756,7 +770,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -66,7 +66,7 @@
  ; On windows:
  ;extension_dir = "ext"
  
-@@ -766,64 +780,6 @@
+@@ -770,64 +784,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -131,7 +131,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -979,19 +935,19 @@
+@@ -983,19 +939,19 @@
  ; Use of this INI entry is deprecated, use global input_encoding instead.
  ; If empty, default_charset or input_encoding or iconv.input_encoding is used.
  ; The precedence is: default_charset < input_encoding < iconv.input_encoding
@@ -152,19 +152,19 @@
 -;iconv.output_encoding =
 +iconv.output_encoding = UTF-8
  
- [intl]
- ;intl.default_locale =
-@@ -1172,6 +1128,9 @@
+ [imap]
+ ; rsh/ssh logins are disabled by default. Use this INI entry if you want to
+@@ -1163,6 +1119,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
 +; The name of the character set to use as the default character set.
 +;mysqli.connect_charset=utf8
 +
- ; Default host for mysql_connect() (doesn't apply in safe mode).
+ ; Default host for mysqli_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1313,7 +1272,7 @@
+@@ -1304,7 +1263,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -173,7 +173,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1747,7 +1706,7 @@
+@@ -1748,7 +1707,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir