update failed tests on carme i686

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

diff --git a/php-ini.patch b/php-ini.patch
index b503725179250d5519a6f8b6712668e9ef951772..5d6b1373ba866515a3f41a8341b83eab98881e66 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,6 +1,6 @@
---- php-5.4.0alpha3/php.ini~   2011-08-08 00:06:52.000000000 +0300
-+++ php-5.4.0alpha3/php.ini    2011-08-08 00:09:15.835275555 +0300
-@@ -223,7 +223,7 @@
+--- 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
+@@ -208,7 +208,7 @@
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
@@ -9,7 +9,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
@@ -18,21 +18,19 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; 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"
  
-@@ -812,54 +812,7 @@
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
- ; disabled on them.
+@@ -735,53 +735,6 @@
  ; http://php.net/enable-dl
--enable_dl = Off
--
+ enable_dl = Off
+ 
 -; cgi.force_redirect is necessary to provide security running PHP as a CGI under
 -; most web servers.  Left undefined, PHP turns this on by default.  You can
 -; turn it off here AT YOUR OWN RISK
@@ -49,7 +47,7 @@
 -; will look for to know it is OK to continue execution.  Setting this variable MAY
 -; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
 -; http://php.net/cgi.redirect-status-env
--;cgi.redirect_status_env = ;
+-;cgi.redirect_status_env =
 -
 -; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI.  PHP's
 -; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
@@ -66,7 +64,7 @@
 -; does not currently support this feature (03/17/2002)
 -; Set to 1 if running under IIS.  Default is zero.
 -; http://php.net/fastcgi.impersonate
--;fastcgi.impersonate = 1;
+-;fastcgi.impersonate = 1
 -
 -; Disable logging through FastCGI connection. PHP's default behavior is to enable
 -; this feature.
@@ -79,11 +77,11 @@
 -; Default is zero.
 -; http://php.net/cgi.rfc2616-headers
 -;cgi.rfc2616_headers = 0
-+enable_dl = Off
- 
+-
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
-@@ -795,52 +795,8 @@
+ ;;;;;;;;;;;;;;;;
+@@ -859,52 +812,9 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -108,7 +106,7 @@
 -;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 11g Instant Client
+-;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 Instant Client
 -;extension=php_openssl.dll
 -;extension=php_pdo_firebird.dll
 -;extension=php_pdo_mysql.dll
@@ -126,19 +124,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
  
@@ -148,7 +160,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 =
  
@@ -158,7 +170,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
@@ -167,7 +179,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