- rel 3

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

diff --git a/php-ini.patch b/php-ini.patch
index 5d6b1373ba866515a3f41a8341b83eab98881e66..90a83d93478c90cdf53e8f60789a2ebeace2c915 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,6 +1,36 @@
---- 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 @@
+--- php-5.4.20/php.ini~        2013-09-27 00:10:56.000000000 +0300
++++ php-5.4.20/php.ini 2013-09-27 00:12:08.255696371 +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
+ ; application users can inadvertently leak otherwise secure information.
++;
++; This is the default settings file for new PHP installations from
++; PLD Linux Distribution.
++;
++; It's based mainly on php.ini-production, but with some changes made with
++; security in mind (see below, consult also http://php.net/manual/en/security.php).
++;
++; Please note, that in PLD installations /etc/php/php.ini file
++; contains global settings for all SAPIs (cgi, cli, apache...),
++; and after reading this file, SAPI-specific file (/etc/php/php-cgi-fcgi.ini,
++; /etc/php/php-cli.ini, /etc/php/php-apache.ini...) is INCLUDED
++; (so you don't have to duplicate whole large file to override only
++; few options)
++
+ 
+ ;;;;;;;;;;;;;;;;;;;
+ ; 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
  ; http://php.net/short-open-tag
@@ -81,16 +111,10 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -859,52 +812,9 @@
- ; If you only provide the name of the extension, PHP will look for it in its
- ; default extension directory.
+@@ -832,44 +832,9 @@
+ ; extension folders as well as the separate PECL DLL download (PHP 5).
+ ; Be sure to appropriately set the extension_dir directive.
  ;
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; 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.
--;
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_fileinfo.dll
@@ -129,14 +153,12 @@
 -;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 ;
- ;;;;;;;;;;;;;;;;;;;
 @@ -938,9 +848,9 @@
  ;filter.default_flags =
  
@@ -175,7 +197,7 @@
  [browscap]
  ; http://php.net/browscap
 -;browscap = extra/browscap.ini
-+browscap = /etc/php/browscap.ini
++;browscap = /usr/share/browscap/php_browscap.ini
  
  [Session]
  ; Handler used to store/retrieve data.
@@ -184,7 +206,7 @@
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir
 -soap.wsdl_cache_dir="/tmp"
-+soap.wsdl_cache_dir="/var/run/php"
++soap.wsdl_cache_dir="/var/cache/php"
  
  ; (time to live) Sets the number of second while cached file will be used
  ; instead of original one.