up to 5.6.11 (10 Jul 2015)

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

diff --git a/php-ini.patch b/php-ini.patch
index 086c4796d67b67da4534ab0b1f729a102f7913e6..89e29d65e8a9edb4589a80c5c4ed6656952d24c1 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.5.2/php.ini~ 2013-08-18 15:03:23.000000000 +0300
-+++ php-5.5.2/php.ini  2013-08-18 15:04:12.055644364 +0300
+--- php-5.6.9/php.ini~ 2015-05-29 12:40:58.000000000 +0300
++++ php-5.6.9/php.ini  2015-05-29 12:42:56.319275415 +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,6 +21,15 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Quick Reference ;
+@@ -198,7 +212,7 @@
+ ;user_ini.filename = ".user.ini"
+ 
+ ; To disable this feature set this option to 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
 @@ -223,7 +237,7 @@
  ; Development Value: Off
  ; Production Value: Off
@@ -48,7 +57,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -735,53 +735,6 @@
+@@ -760,53 +760,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -92,8 +101,8 @@
 -;fastcgi.logging = 0
 -
 -; cgi.rfc2616_headers configuration option tells PHP what type of headers to
--; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
--; is supported by Apache. When this option is set to 1 PHP will send
+-; use when sending HTTP response code. If set to 0, PHP sends Status: header that
+-; is supported by Apache. When this option is set to 1, PHP will send
 -; RFC2616 compliant header.
 -; Default is zero.
 -; http://php.net/cgi.rfc2616-headers
@@ -102,7 +111,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -830,51 +830,9 @@
+@@ -884,49 +837,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -111,9 +120,7 @@
 -; 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.
-+; Ideally in PLD Linux you should install appropriate php-<extension> or
-+; php-pecl-<extension> package.
- ;
+-;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_fileinfo.dll
@@ -128,8 +135,7 @@
 -;extension=php_exif.dll      ; Must be after mbstring as it depends on it
 -;extension=php_mysql.dll
 -;extension=php_mysqli.dll
--;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
+-;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
@@ -152,19 +158,30 @@
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
--
++; Ideally in PLD Linux you should install appropriate php-<extension> or
++; php-pecl-<extension> package.
+ 
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
- ;;;;;;;;;;;;;;;;;;;
-@@ -938,9 +848,9 @@
- ;filter.default_flags =
- 
- [iconv]
--;iconv.input_encoding = ISO-8859-1
--;iconv.internal_encoding = ISO-8859-1
--;iconv.output_encoding = ISO-8859-1
+@@ -964,19 +876,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
+-;iconv.input_encoding =
 +iconv.input_encoding = UTF-8
+ 
+ ; Use of this INI entry is deprecated, use global internal_encoding instead.
+ ; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+ ; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
+-;iconv.internal_encoding =
 +iconv.internal_encoding = UTF-8
+ 
+ ; Use of this INI entry is deprecated, use global output_encoding instead.
+ ; If empty, default_charset or output_encoding or iconv.output_encoding is used.
+ ; The precedence is: default_charset < output_encoding < iconv.output_encoding
+ ; To use an output encoding conversion, iconv's output handler must be set
+ ; otherwise output encoding conversion cannot be performed.
+-;iconv.output_encoding =
 +iconv.output_encoding = UTF-8
  
  [intl]
@@ -194,11 +211,20 @@
  [browscap]
  ; http://php.net/browscap
 -;browscap = extra/browscap.ini
-+browscap = /etc/php/browscap.ini
++;browscap = /usr/share/browscap/php_browscap.ini
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1822,7 +1738,7 @@
+@@ -1678,7 +1610,7 @@
+ [Assertion]
+ ; Assert(expr); active by default.
+ ; http://php.net/assert.active
+-;assert.active = On
++assert.active = Off
+ 
+ ; Issue a PHP warning for each failed assertion.
+ ; http://php.net/assert.warning
+@@ -1806,7 +1738,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir