X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-ini.patch;h=d38d6c5645f857e2a4cece4f7192ab154d1c24bd;hb=264062f6ca20146c6577d59d9bf0895f1cf729b7;hp=2b8f90af4c9759b07875005a1f94f5e40deff494;hpb=5ff070d48177f5f3a231401f52318168db8b2ffb;p=packages%2Fphp.git

diff --git a/php-ini.patch b/php-ini.patch
index 2b8f90a..d38d6c5 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,25 +1,21 @@
---- php-7.0.12/php.ini	2016-10-13 14:04:17.000000000 +0000
-+++ php-7.0.12/php.ini	2016-10-27 07:40:55.773715000 +0000
-@@ -82,6 +82,20 @@
+--- 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
+@@ -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/php/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
-+; (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.
+ ; This is the php.ini-production INI file.
  
 @@ -149,7 +163,7 @@
  ;   Production Value: 5
@@ -30,16 +26,16 @@
  ;   Development Value: Off
  ;   Production Value: Off
  
-@@ -175,7 +189,7 @@
+@@ -170,7 +184,7 @@
  ;user_ini.filename = ".user.ini"
  
- ; To disable this feature set this option to empty value
+ ; 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
-@@ -195,7 +209,7 @@
+@@ -190,7 +204,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 +44,7 @@
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -356,7 +370,7 @@
+@@ -371,7 +385,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,16 +53,16 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -718,7 +732,7 @@
+@@ -752,7 +766,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
--; extension_dir = "./"
-+;extension_dir = "/usr/lib/php"
+-;extension_dir = "./"
++extension_dir = "/usr/lib/php"
  ; On windows:
- ; extension_dir = "ext"
+ ;extension_dir = "ext"
  
-@@ -732,65 +746,6 @@
+@@ -766,64 +780,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -99,10 +95,9 @@
 -
 -; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside
 -; of the web tree and people will not be able to circumvent .htaccess security.
--; http://php.net/cgi.dicard-path
 -;cgi.discard_path=1
 -
--; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
+-; FastCGI under IIS supports the ability to impersonate
 -; security tokens of the calling client.  This allows IIS to define the
 -; security context that the request runs under.  mod_fastcgi under Apache
 -; does not currently support this feature (03/17/2002)
@@ -132,60 +127,10 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -868,47 +823,8 @@
- ; If you only provide the name of the extension, PHP will look for it in its
- ; default extension directory.
- ;
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) 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=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_fileinfo.dll
--;extension=php_ftp.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_intl.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_exif.dll      ; Must be after mbstring as it depends on it
--;extension=php_mysqli.dll
--;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
--;extension=php_openssl.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_shmop.dll
--
--; The MIBS data available in the PHP distribution must be installed.
--; See http://www.php.net/manual/en/snmp.installation.php
--;extension=php_snmp.dll
--
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite3.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
-+; Ideally in TLD Linux you should install appropriate php-<extension> or
-+; php-pecl-<extension> package.
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
-@@ -946,19 +862,19 @@
+@@ -979,19 +935,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 < intput_encoding < iconv.input_encoding
+ ; The precedence is: default_charset < input_encoding < iconv.input_encoding
 -;iconv.input_encoding =
 +iconv.input_encoding = UTF-8
  
@@ -205,7 +150,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1154,6 +1070,9 @@
+@@ -1172,6 +1128,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -215,16 +160,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1281,7 +1200,7 @@
- 
- [browscap]
- ; http://php.net/browscap
--;browscap = extra/browscap.ini
-+browscap = /etc/php/browscap.ini
- 
- [Session]
- ; Handler used to store/retrieve data.
-@@ -1708,7 +1627,7 @@
+@@ -1747,7 +1706,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir