X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-ini.patch;h=3d37fd86c5ac0ddf5520845da9d05759ac495ff6;hb=1d1bc1bc9645b3f6b4d76cfa2d5a320455fa3ee6;hp=9c247b9854a93d3dc175d45e74423bf979619e8e;hpb=b19c333515a18b1c3d9029eff51a7bd4cb4b5caa;p=packages%2Fphp.git

diff --git a/php-ini.patch b/php-ini.patch
index 9c247b9..3d37fd8 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,27 +1,23 @@
---- php-5.6.12.orig/php.ini	2015-08-06 07:55:57.000000000 +0000
-+++ php-5.6.12/php.ini	2015-08-09 14:51:00.224790532 +0000
-@@ -82,6 +82,20 @@
+--- 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,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 @@
+@@ -144,7 +158,7 @@
  ;   Production Value: 5
  
  ; short_open_tag
@@ -30,16 +26,16 @@
  ;   Development Value: Off
  ;   Production Value: Off
  
-@@ -175,7 +189,7 @@
+@@ -160,7 +174,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 @@
+@@ -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 +44,7 @@
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -360,7 +374,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,16 +53,16 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -731,7 +745,7 @@
+@@ -756,7 +770,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"
  
-@@ -745,53 +759,6 @@
+@@ -770,64 +784,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -97,7 +93,11 @@
 -; http://php.net/cgi.fix-pathinfo
 -;cgi.fix_pathinfo=1
 -
--; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
+-; 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.
+-;cgi.discard_path=1
+-
+-; 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)
@@ -116,65 +116,21 @@
 -; Default is zero.
 -; http://php.net/cgi.rfc2616-headers
 -;cgi.rfc2616_headers = 0
+-
+-; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #!
+-; (shebang) at the top of the running script. This line might be needed if the
+-; script support running both as stand-alone script and via PHP CGI<. PHP in CGI
+-; mode skips this line and ignores its content if this directive is turned on.
+-; http://php.net/cgi.check-shebang-line
+-;cgi.check_shebang_line=1
 -
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -869,48 +836,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_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_mysql.dll
--;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_sybase_ct.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 ;
-@@ -948,19 +875,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 < intput_encoding < iconv.input_encoding
+ ; The precedence is: default_charset < input_encoding < iconv.input_encoding
 -;iconv.input_encoding =
 +iconv.input_encoding = UTF-8
  
@@ -192,38 +148,19 @@
 -;iconv.output_encoding =
 +iconv.output_encoding = UTF-8
  
- [intl]
- ;intl.default_locale =
-@@ -1174,6 +1101,9 @@
- ; http://php.net/mysql.connect-timeout
- mysql.connect_timeout = 60
- 
-+; The name of the character set to use as the default character set.
-+;mysql.connect_charset=utf8
-+
- ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
- ; SQL-Errors will be displayed.
- ; http://php.net/mysql.trace-mode
-@@ -1213,6 +1143,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 =
-@@ -1379,7 +1312,7 @@
- 
- [browscap]
- ; http://php.net/browscap
--;browscap = extra/browscap.ini
-+browscap = /etc/php/browscap.ini
- 
- [Session]
- ; Handler used to store/retrieve data.
-@@ -1839,7 +1772,7 @@
+@@ -1748,7 +1707,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir