- fix for pcre 8.30 (do not use pcre_info deprecated 12 years ago)

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

diff --git a/php-ini.patch b/php-ini.patch
index a68d1e34e2cf245f0deea1b48575c40738923e73..f9b46a0a13337819a456f0ab24e990a161e9d0c8 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,14 @@
---- php-5.3.1/php.ini~ 2010-02-20 16:22:57.026908000 +0200
-+++ php-5.3.1/php.ini  2010-02-20 16:23:03.343575520 +0200
+--- php-5.3.9/php.ini~ 2012-01-11 21:35:14.000000000 +0200
++++ php-5.3.9/php.ini  2012-01-11 21:35:49.227068991 +0200
+@@ -223,7 +223,7 @@
+ ; Development Value: Off
+ ; Production Value: Off
+ ; http://php.net/short-open-tag
+-short_open_tag = Off
++short_open_tag = On
+ 
+ ; Allow ASP-style <% %> tags.
+ ; http://php.net/asp-tags
 @@ -428,7 +428,7 @@
  ; threat in any way, but it makes it possible to determine whether you use PHP
  ; on your server or not.
@@ -9,15 +18,6 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -583,7 +583,7 @@
- ; Development Value: On
- ; Production Value: Off
- ; http://php.net/track-errors
--track_errors = Off
-+track_errors = On
- 
- ; Turn off normal error reporting and emit XML-RPC error XML
- ; http://php.net/xmlrpc-errors
 @@ -804,7 +804,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
@@ -27,10 +27,12 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -814,53 +814,6 @@
+@@ -812,54 +812,7 @@
+ ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
+ ; disabled on them.
  ; 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
@@ -77,11 +79,24 @@
 -; Default is zero.
 -; http://php.net/cgi.rfc2616-headers
 -;cgi.rfc2616_headers = 0
--
++enable_dl = Off
+ 
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
- ;;;;;;;;;;;;;;;;
-@@ -938,54 +891,6 @@
+@@ -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 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -93,8 +108,6 @@
 -;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
--;extension=php_dba.dll
--;extension=php_exif.dll
 -;extension=php_fileinfo.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
@@ -104,12 +117,11 @@
 -;extension=php_interbase.dll
 -;extension=php_ldap.dll
 -;extension=php_mbstring.dll
--;extension=php_ming.dll
--;extension=php_mssql.dll
+-;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 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_mssql.dll
@@ -119,10 +131,13 @@
 -;extension=php_pdo_pgsql.dll
 -;extension=php_pdo_sqlite.dll
 -;extension=php_pgsql.dll
--;extension=php_phar.dll
 -;extension=php_pspell.dll
 -;extension=php_shmop.dll
+-
+-; The MIBS data available in the PHP distribution must be installed. 
+-; See http://www.php.net/manual/en/snmp.installation.php 
 -;extension=php_snmp.dll
+-
 -;extension=php_soap.dll
 -;extension=php_sockets.dll
 -;extension=php_sqlite.dll
@@ -132,10 +147,11 @@
 -;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 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60