- PHP_5_6 from PLD minus pldlogo patch

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

diff --git a/php-ini.patch b/php-ini.patch
index fa7cfe25bad68ebec0934dff6ced05943092fe8d..7d03c6e0aac17e99b6ec138d722d7567866f22d9 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.3.20/php.ini 2013-01-22 23:20:03.433447006 +0200
-+++ php-5.3.20/php.ini 2013-01-22 23:20:03.433447006 +0200
+--- php-5.6.0beta1/php.ini~    2014-04-21 21:38:01.000000000 +0300
++++ php-5.6.0beta1/php.ini     2014-04-21 21:51:47.379819417 +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
@@ -30,7 +39,7 @@
  
  ; Allow ASP-style <% %> tags.
  ; http://php.net/asp-tags
-@@ -428,7 +428,7 @@
+@@ -372,7 +372,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
@@ -39,16 +48,16 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -804,7 +804,7 @@
+@@ -725,7 +725,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
 -; extension_dir = "./"
-+extension_dir = "/usr/lib/php"
++;extension_dir = "/usr/lib/php"
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -826,53 +826,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,20 +111,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -876,11 +876,7 @@
- ;
- ;   extension=modulename.extension
- ;
--; For example, on Windows:
--;
--;   extension=msql.dll
--;
--; ... or under UNIX:
-+; For example under UNIX:
- ;
- ;   extension=msql.so
- ;
-@@ -899,53 +899,8 @@
+@@ -884,49 +837,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -139,11 +135,9 @@
 -;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_mssql.dll
 -;extension=php_pdo_mysql.dll
 -;extension=php_pdo_oci.dll
 -;extension=php_pdo_odbc.dll
@@ -159,19 +153,40 @@
 -
 -;extension=php_soap.dll
 -;extension=php_sockets.dll
--;extension=php_sqlite.dll
 -;extension=php_sqlite3.dll
 -;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
--;extension=php_zip.dll
 +; Ideally in PLD Linux you should install appropriate php-<extension> or
 +; php-pecl-<extension> package.
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -1235,6 +1140,9 @@
+@@ -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]
+ ;intl.default_locale =
+@@ -1152,6 +1062,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -181,7 +196,7 @@
  ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
  ; SQL-Errors will be displayed.
  ; http://php.net/mysql.trace-mode
-@@ -1274,6 +1182,9 @@
+@@ -1191,6 +1104,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -191,7 +206,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1440,7 +1351,7 @@
+@@ -1357,7 +1273,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -200,7 +215,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1863,7 +1774,7 @@
+@@ -1822,7 +1738,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir