- updated to 5.4.45

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

diff --git a/php-ini.patch b/php-ini.patch
index c4b7f07a8a23a66725c69f7cc83ee012fb345291..f147a3423c3ca2c94698791eafb48ab0c2f1d8c8 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.4.18/php.ini 2013-08-14 05:47:24.000000000 +0000
-+++ php-5.4.18/php.ini 2013-08-19 12:11:57.755000043 +0000
+--- php-5.4.21/php.ini.orig    2013-10-16 07:39:33.000000000 +0200
++++ php-5.4.21/php.ini 2013-11-03 11:45:28.586384794 +0100
 @@ -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
@@ -19,9 +19,9 @@
 +; few options)
 +
  
- ;;;;;;;;;;;;;;;;;;;
- ; Quick Reference ;
-@@ -157,7 +171,7 @@
+ ; This is php.ini-production INI file.
+ 
+@@ -159,7 +173,7 @@
  ;   Production Value: 5
  
  ; short_open_tag
@@ -30,7 +30,16 @@
  ;   Development Value: Off
  ;   Production Value: Off
  
-@@ -372,7 +386,7 @@
+@@ -205,7 +219,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
+@@ -373,7 +387,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
@@ -39,7 +48,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -725,7 +739,7 @@
+@@ -726,7 +740,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -48,7 +57,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -735,53 +749,6 @@
+@@ -736,53 +750,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -102,11 +111,10 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -858,52 +825,9 @@
- ;
+@@ -860,50 +827,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
--;
+ ;
 -; 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)
@@ -151,14 +159,12 @@
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
--;extension=php_zip.dll
-+
 +; Ideally in TLD Linux you should install appropriate php-<extension> or
 +; php-pecl-<extension> package.
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -938,9 +862,9 @@
+@@ -938,9 +863,9 @@
  ;filter.default_flags =
  
  [iconv]
@@ -171,7 +177,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1154,6 +1078,9 @@
+@@ -1154,6 +1079,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -181,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
-@@ -1193,6 +1120,9 @@
+@@ -1193,6 +1121,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -191,7 +197,7 @@
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1359,7 +1289,7 @@
+@@ -1359,7 +1290,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -200,7 +206,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1824,7 +1754,7 @@
+@@ -1824,7 +1755,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir