- updated for 5.5.4

diff --git a/php-ini.patch b/php-ini.patch
index 00720c3db7b4a528d774258763db1787259c58e7..7d3dbcd019aa279ad1498dd5dca3746e08c70fca 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.5.2/php.ini  2013-08-15 20:42:04.000000000 +0000
-+++ php-5.5.2/php.ini  2013-08-19 08:38:00.942999606 +0000
+--- php-5.5.4/php.ini  2013-09-18 13:08:04.000000000 +0000
++++ php-5.5.4/php.ini  2013-09-20 07:55:29.509891329 +0000
 @@ -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
@@ -30,16 +30,16 @@
  ;   Development Value: Off
  ;   Production Value: Off
  
-@@ -204,7 +218,7 @@
- ; confused and end up parsing the wrong code in the wrong context. But because
- ; this short cut has been a feature for such a long time, it's currently still
- ; supported for backwards compatibility, but we recommend you don't use them.
+@@ -203,7 +217,7 @@
+ ; documents, however this remains supported for backward compatibility reasons.
+ ; Note that this directive does not control the <?= shorthand tag, which can be
+ ; used regardless of this directive.
 -; Default Value: On
 +; Default Value: Off
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -372,7 +386,7 @@
+@@ -371,7 +385,7 @@
  ; threat in any way, but it makes it possible to determine whether you use PHP
  ; on your server or not.
  ; http://php.net/expose-php
@@ -48,7 +48,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -725,7 +739,7 @@
+@@ -724,7 +738,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -57,7 +57,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -739,53 +753,6 @@
+@@ -738,53 +752,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -111,7 +111,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -863,50 +830,9 @@
+@@ -862,50 +829,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -159,13 +159,12 @@
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
-+
 +; Ideally in TLD Linux you should install appropriate php-<extension> or
 +; php-pecl-<extension> package.
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -941,9 +867,9 @@
+@@ -940,9 +865,9 @@
  ;filter.default_flags =
  
  [iconv]
@@ -178,7 +177,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1157,6 +1083,9 @@
+@@ -1156,6 +1081,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -188,7 +187,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
-@@ -1196,6 +1125,9 @@
+@@ -1195,6 +1123,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -198,7 +197,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1362,7 +1294,7 @@
+@@ -1361,7 +1292,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -207,7 +206,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1827,7 +1759,7 @@
+@@ -1834,7 +1765,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir