- up to 5.3.16

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

diff --git a/php-ini.patch b/php-ini.patch
index a0ed0e0f7cf9ce9917ee4361b8208632f4e33541..00d4a506a95f02ab1335c4ebda0b0b1b93b417f5 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.3.4/php.ini~ 2010-12-12 23:03:42.000000000 +0200
-+++ php-5.3.4/php.ini  2010-12-12 23:05:56.583592856 +0200
+--- php-5.3.15/php.ini~        2012-08-02 03:24:53.000000000 +0300
++++ php-5.3.15/php.ini 2012-08-02 03:31:32.384194939 +0300
 @@ -223,7 +223,7 @@
  ; Development Value: Off
  ; Production Value: Off
@@ -27,12 +27,10 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -812,54 +812,7 @@
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
- ; disabled on them.
+@@ -826,53 +826,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,10 +77,10 @@
 -; Default is zero.
 -; http://php.net/cgi.rfc2616-headers
 -;cgi.rfc2616_headers = 0
-+enable_dl = Off
- 
+-
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
+ ;;;;;;;;;;;;;;;;
 @@ -876,11 +876,7 @@
  ;
  ;   extension=modulename.extension
@@ -96,7 +94,7 @@
  ;
  ;   extension=msql.so
  ;
-@@ -887,39 +887,8 @@
+@@ -899,53 +899,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -121,7 +119,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_mssql.dll
@@ -133,11 +131,25 @@
 -;extension=php_pgsql.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
+-;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.
  
- ; The MIBS data available in the PHP distribution must be installed. 
- ; See http://www.php.net/manual/en/snmp.installation.php 
+ ;;;;;;;;;;;;;;;;;;;
+ ; Module Settings ;
 @@ -1235,6 +1140,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60