- updated to 7.2.1, partial PLD merge

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

diff --git a/php-ini.patch b/php-ini.patch
index 2b8f90af4c9759b07875005a1f94f5e40deff494..83aa23eb8807777cfed4bfc9f5e9358cfb716827 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- 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
+--- 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 @@
  ; much more verbose when it comes to errors. We recommend using the
  ; development version only in development environments, as errors shown to
@@ -30,7 +30,7 @@
  ;   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
@@ -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
-@@ -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 +48,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,7 +57,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -718,7 +732,7 @@
+@@ -734,7 +748,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -66,7 +66,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -732,65 +746,6 @@
+@@ -748,65 +762,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -132,57 +132,7 @@
  ;;;;;;;;;;;;;;;;
  ; 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 @@
+@@ -961,19 +916,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
@@ -205,7 +155,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1154,6 +1070,9 @@
+@@ -1165,6 +1120,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -215,7 +165,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 @@
+@@ -1314,7 +1272,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -224,7 +174,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1708,7 +1627,7 @@
+@@ -1741,7 +1699,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir