SOURCES: php-ini.patch - from DEVEL

[arekm]

Author: arekm                        Date: Thu Dec 15 13:34:16 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from DEVEL

---- Files affected:
SOURCES:
   php-ini.patch (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SOURCES/php-ini.patch
diff -u SOURCES/php-ini.patch:1.15 SOURCES/php-ini.patch:1.16
--- SOURCES/php-ini.patch:1.15	Sun Jun 19 18:20:16 2005
+++ SOURCES/php-ini.patch	Thu Dec 15 14:34:11 2005
@@ -1,5 +1,6 @@
---- php-5.0.1.org/php.ini	2004-08-13 13:28:45.800911928 +0200
-+++ php-5.0.1/php.ini	2004-08-13 13:31:28.844125592 +0200
+diff -urbB php-5.1.0.org/php.ini php-5.1.0/php.ini
+--- php-5.1.0.org/php.ini	2005-11-25 02:24:23.408519000 +0100
++++ php-5.1.0/php.ini	2005-11-25 02:26:06.570966750 +0100
 @@ -3,13 +3,18 @@
  ;;;;;;;;;;;
  ; WARNING ;
@@ -26,19 +27,18 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; About php.ini   ;
-@@ -59,10 +64,72 @@
+@@ -59,11 +64,73 @@
  ;;;;;;;;;;;;;;;;;;;
  ; About this file ;
  ;;;;;;;;;;;;;;;;;;;
 -; All the values in the php.ini-dist file correspond to the builtin
 -; defaults (that is, if no php.ini is used, or if you delete these lines,
 -; the builtin defaults will be identical).
--
 +; If you use constants in your value, and these constants belong to a
 +; dynamically loaded extension (either a PHP extension or a Zend extension),
 +; you may only use these constants *after* the line that loads the extension.
-+
-+
+ 
+ 
 +; Below is the list of settings changed from default as specified in
 +; php.ini-recommended. These settings make PHP more secure and encourage
 +; cleaner coding.
@@ -100,9 +100,10 @@
 +;     It's not possible to decide to force a variable to be passed by reference
 +;     when calling a function.  The PHP 4 style to do this is by making the
 +;     function require the relevant argument by reference.
- 
++
  ;;;;;;;;;;;;;;;;;;;;
  ; Language Options ;
+ ;;;;;;;;;;;;;;;;;;;;
 @@ -86,7 +153,7 @@
  asp_tags = Off
  
@@ -112,13 +113,14 @@
  
  ; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
  y2k_compliance = On
-@@ -285,14 +352,14 @@
+@@ -289,14 +356,16 @@
  ;
--;   - Show all errors except for notices and coding standards warnings
-+;   - Show all errors
+ ;   - Show all errors except for notices and coding standards warnings
  ;
--error_reporting  =  E_ALL & ~E_NOTICE & ~E_STRICT
-+error_reporting  =  E_ALL
+-error_reporting  =  E_ALL & ~E_NOTICE
++;error_reporting  =  E_ALL & ~E_NOTICE
++
++error_reporting = E_ALL
  
  ; Print out errors (as a part of the output).  For production web sites,
  ; you're strongly encouraged to turn this feature off, and use error logging
@@ -130,18 +132,7 @@
  
  ; Even when display_errors is on, errors that occur during PHP's startup
  ; sequence are not displayed.  It's strongly recommended to keep
-@@ -447,7 +514,7 @@
- user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+extension_dir = "/usr/lib/php"
- 
- ; Whether or not to enable the dl() function.  The dl() function does NOT work
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
---- php-5.0.4/php.ini~	2005-06-19 19:19:01.000000000 +0300
-+++ php-5.0.4/php.ini	2005-06-19 19:19:21.000000000 +0300
-@@ -369,7 +369,7 @@
+@@ -306,7 +375,7 @@
  ; Log errors into a log file (server-specific log, stderr, or error_log (below))
  ; As stated above, you're strongly advised to use error logging in place of
  ; error displaying on production web sites.
@@ -150,3 +141,12 @@
  
  ; Set maximum length of log_errors. In error_log information about the source is
  ; added. The default is 1024 and 0 allows to not apply any maximum length at all.
+@@ -458,7 +527,7 @@
+ user_dir =
+ 
+ ; Directory in which the loadable extensions (modules) reside.
+-extension_dir = "./"
++extension_dir = "/usr/lib/php"
+ 
+ ; Whether or not to enable the dl() function.  The dl() function does NOT work
+ ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-ini.patch?r1=1.15&r2=1.16&f=u