[packages/php/dev-7.3: 3/6] update php-ini.patch

[glen]

commit 545270fb561b3c398c45bb4d73ee9cfc24b9ee3b
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Jul 9 17:37:16 2018 +0300

    update php-ini.patch

 opcache.ini   |  3 +--
 php-ini.patch | 52 ++++++++++++++++++++++++++++------------------------
 2 files changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/opcache.ini b/opcache.ini
index 2143b58..2cc841d 100644
--- a/opcache.ini
+++ b/opcache.ini
@@ -47,9 +47,8 @@ zend_extension=opcache.so
 
 ; A bitmask, where each bit enables or disables the appropriate OPcache
 ; passes
-;opcache.optimization_level=0xffffffff
+;opcache.optimization_level=0x7FFFBFFF
 
-;opcache.inherited_hack=1
 ;opcache.dups_fix=0
 
 ; The location of the OPcache blacklist file (wildcards allowed).
diff --git a/php-ini.patch b/php-ini.patch
index 6135fb4..570f94d 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-7.2.5/php.ini~	2018-04-27 23:35:26.000000000 +0300
-+++ php-7.2.5/php.ini	2018-04-27 23:40:07.930515960 +0300
+--- php-7.3.0alpha3/php.ini~	2018-07-09 13:40:12.000000000 +0300
++++ php-7.3.0alpha3/php.ini	2018-07-09 17:27:47.804465246 +0300
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommending using the
  ; development version only in development environments as errors shown to
@@ -21,10 +21,13 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Quick Reference ;
-@@ -198,7 +212,7 @@
- ;user_ini.filename = ".user.ini"
- 
- ; To disable this feature set this option to empty value
+@@ -181,10 +181,8 @@
+ ; php.ini Options  ;
+ ;;;;;;;;;;;;;;;;;;;;
+ ; Name for user-defined php.ini (.htaccess) files. Default is ".user.ini"
+-;user_ini.filename = ".user.ini"
+-
+ ; To disable this feature set this option to an empty value
 -;user_ini.filename =
 +user_ini.filename =
  
@@ -48,16 +51,18 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -725,7 +725,7 @@
+@@ -756,9 +756,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
--; extension_dir = "./"
+-;extension_dir = "./"
+-; On windows:
+-;extension_dir = "ext"
 +;extension_dir = "/usr/lib/php"
- ; On windows:
- ; extension_dir = "ext"
  
-@@ -761,65 +761,6 @@
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
+@@ -768,64 +768,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -90,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)
@@ -123,12 +127,14 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -838,47 +838,8 @@
+@@ -844,49 +844,9 @@
  ; deprecated in a future PHP major version. So, when it is possible, please
  ; move to the new ('extension=<ext>) syntax.
  ;
 -; Notes for Windows environments :
--;
++; Ideally in PLD Linux you should install appropriate php73-<extension> or
++; php73-pecl-<extension> package.
+ ;
 -; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
 -;   extension folders as well as the separate PECL DLL download (PHP 5+).
 -;   Be sure to appropriately set the extension_dir directive.
@@ -164,19 +170,19 @@
 -
 -;extension=soap
 -;extension=sockets
+-;extension=sodium
 -;extension=sqlite3
 -;extension=tidy
 -;extension=xmlrpc
 -;extension=xsl
-+; Ideally in PLD Linux you should install appropriate php72-<extension> or
-+; php72-pecl-<extension> package.
- 
+-
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -964,19 +876,19 @@
+ ;;;;;;;;;;;;;;;;;;;
+@@ -923,19 +883,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
  
@@ -224,7 +230,7 @@
  
  ; (time to live) Sets the number of second while cached file will be used
  ; instead of original one.
-@@ -1681,134 +1681,6 @@ ldap.max_links = -1
+@@ -1670,133 +1670,6 @@
  [dba]
  ;dba.default_handler=
  
@@ -275,9 +281,8 @@
 -
 -; A bitmask, where each bit enables or disables the appropriate OPcache
 -; passes
--;opcache.optimization_level=0xffffffff
+-;opcache.optimization_level=0x7FFFBFFF
 -
--;opcache.inherited_hack=1
 -;opcache.dups_fix=0
 -
 -; The location of the OPcache blacklist file (wildcards allowed).
@@ -359,4 +364,3 @@
  [curl]
  ; A default value for the CURLOPT_CAINFO option. This is required to be an
  ; absolute path.
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/d48807f9401cb3058410533c66cc58983067c944