- updated to 7.3.0, merged some patches from PLD, not tested yet

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

diff --git a/php-ini.patch b/php-ini.patch
index 83aa23eb8807777cfed4bfc9f5e9358cfb716827..dd260eb635629c367a5cb769f07247b8563c2774 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- 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
+--- 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,20 @@
  ; much more verbose when it comes to errors. We recommend using the
  ; development version only in development environments, as errors shown to
@@ -19,7 +19,7 @@
 +; few options)
 +
  
- ; This is php.ini-production INI file.
+ ; This is the php.ini-production INI file.
  
 @@ -149,7 +163,7 @@
  ;   Production Value: 5
@@ -33,7 +33,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 =
  
@@ -57,16 +57,16 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -734,7 +748,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"
  
-@@ -748,65 +762,6 @@
+@@ -766,64 +780,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -99,10 +99,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,10 +131,10 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -961,19 +916,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
  
@@ -155,7 +154,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1165,6 +1120,9 @@
+@@ -1172,6 +1128,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -165,7 +164,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1314,7 +1272,7 @@
+@@ -1313,7 +1272,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -174,7 +173,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1741,7 +1699,7 @@
+@@ -1747,7 +1706,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir