- release 3 (by relup.sh)

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

diff --git a/php-ini.patch b/php-ini.patch
index c651cf61c64aa94af68c8fbe3b2dc2700f647c45..9d1ace5344d97b965253461173b146228459c7ad 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- 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
+--- php-5.5.2/php.ini~ 2013-08-18 15:03:23.000000000 +0300
++++ php-5.5.2/php.ini  2013-08-18 15:04:12.055644364 +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
@@ -102,7 +111,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -859,52 +812,9 @@
+@@ -830,51 +830,9 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -111,7 +120,9 @@
 -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
 -; extension folders as well as the separate PECL DLL download (PHP 5).
 -; Be sure to appropriately set the extension_dir directive.
--;
++; Ideally in PLD Linux you should install appropriate php-<extension> or
++; php-pecl-<extension> package.
+ ;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_fileinfo.dll
@@ -150,11 +161,7 @@
 -;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 ;
  ;;;;;;;;;;;;;;;;;;;