packages: php/php-ini.patch - rediff

[glen]

Author: glen                         Date: Sat Feb 20 14:23:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rediff

---- Files affected:
packages/php:
   php-ini.patch (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: packages/php/php-ini.patch
diff -u packages/php/php-ini.patch:1.36 packages/php/php-ini.patch:1.37
--- packages/php/php-ini.patch:1.36	Thu Nov 19 22:27:19 2009
+++ packages/php/php-ini.patch	Sat Feb 20 15:23:32 2010
@@ -1,5 +1,5 @@
---- php-5.3.0/php.ini.orig	2009-07-06 21:50:34.212939491 +0200
-+++ php-5.3.0/php.ini	2009-07-06 21:54:46.076247404 +0200
+--- 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
 @@ -428,7 +428,7 @@
  ; threat in any way, but it makes it possible to determine whether you use PHP
  ; on your server or not.
@@ -18,7 +18,7 @@
  
  ; Turn off normal error reporting and emit XML-RPC error XML
  ; http://php.net/xmlrpc-errors
-@@ -808,7 +808,7 @@
+@@ -804,7 +804,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -27,7 +27,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -818,53 +818,6 @@
+@@ -814,53 +814,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -81,7 +81,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -891,54 +891,6 @@
+@@ -938,54 +891,6 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -136,7 +136,7 @@
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
  ;;;;;;;;;;;;;;;;;;;
-@@ -1232,6 +1138,9 @@
+@@ -1235,6 +1140,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -146,7 +146,7 @@
  ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
  ; SQL-Errors will be displayed.
  ; http://php.net/mysql.trace-mode
-@@ -1271,6 +1180,9 @@
+@@ -1274,6 +1182,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -156,7 +156,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1437,7 +1349,7 @@
+@@ -1440,7 +1351,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -165,12 +165,12 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1857,7 +1769,7 @@
+@@ -1863,7 +1774,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"
  
- ; (time to live) Sets the number of second while cached file will be used 
+ ; (time to live) Sets the number of second while cached file will be used
  ; instead of original one.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php-ini.patch?r1=1.36&r2=1.37&f=u