- updated to 5.4.16

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

diff --git a/php-ini.patch b/php-ini.patch
index fa7cfe25bad68ebec0934dff6ced05943092fe8d..c651cf61c64aa94af68c8fbe3b2dc2700f647c45 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.4.5/php.ini~ 2012-07-20 12:22:18.000000000 +0300
++++ php-5.4.5/php.ini  2012-07-20 12:32:16.646206310 +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
@@ -30,7 +30,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 +39,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 @@
+@@ -735,53 +735,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -102,20 +102,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 @@
+@@ -859,52 +812,9 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -143,7 +130,6 @@
 -;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 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 +145,33 @@
 -
 -;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 @@
+ ;;;;;;;;;;;;;;;;;;;
+@@ -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
++iconv.input_encoding = UTF-8
++iconv.internal_encoding = UTF-8
++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 +181,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 +191,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 +200,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