- cosmetics

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

diff --git a/php-ini.patch b/php-ini.patch
index 83aa23eb8807777cfed4bfc9f5e9358cfb716827..c73e737183e2f79ba196a8087845f11a7a92bdd8 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,25 +1,21 @@
---- 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 @@
+--- 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/php73/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
@@ -33,7 +29,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 +53,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 +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,10 +127,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 +150,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1165,6 +1120,9 @@
+@@ -1172,6 +1128,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -165,16 +160,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 @@
- 
- [browscap]
- ; http://php.net/browscap
--;browscap = extra/browscap.ini
-+browscap = /etc/php/browscap.ini
- 
- [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