- updated to 5.6.12

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

diff --git a/php-ini.patch b/php-ini.patch
index e376857fed30137090e764e643985650e0ad40b2..9c247b9854a93d3dc175d45e74423bf979619e8e 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,6 +1,5 @@
-diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
---- php-5.6.0.orig/php.ini     2014-08-27 13:31:35.000000000 +0000
-+++ php-5.6.0/php.ini  2014-09-15 08:41:06.585000000 +0000
+--- php-5.6.12.orig/php.ini    2015-08-06 07:55:57.000000000 +0000
++++ php-5.6.12/php.ini 2015-08-09 14:51:00.224790532 +0000
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommend using the
  ; development version only in development environments, as errors shown to
@@ -49,7 +48,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
-@@ -363,7 +377,7 @@
+@@ -360,7 +374,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
@@ -58,7 +57,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -732,7 +746,7 @@
+@@ -731,7 +745,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -67,7 +66,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -746,53 +760,6 @@
+@@ -745,53 +759,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -121,7 +120,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -870,49 +837,8 @@
+@@ -869,48 +836,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -154,7 +153,6 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
 -;extension=php_pdo_pgsql.dll
 -;extension=php_pdo_sqlite.dll
 -;extension=php_pgsql.dll
--;extension=php_pspell.dll
 -;extension=php_shmop.dll
 -
 -; The MIBS data available in the PHP distribution must be installed. 
@@ -173,7 +171,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -950,19 +876,19 @@
+@@ -948,19 +875,19 @@
  ; Use of this INI entry is deprecated, use global input_encoding instead.
  ; If empty, default_charset or input_encoding or iconv.input_encoding is used.
  ; The precedence is: default_charset < intput_encoding < iconv.input_encoding
@@ -196,7 +194,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  
  [intl]
  ;intl.default_locale =
-@@ -1176,6 +1102,9 @@
+@@ -1174,6 +1101,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -206,7 +204,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  ; 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
-@@ -1215,6 +1144,9 @@
+@@ -1213,6 +1143,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -216,7 +214,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  ; Default host for mysql_connect() (doesn't apply in safe mode).
  ; http://php.net/mysqli.default-host
  mysqli.default_host =
-@@ -1381,7 +1313,7 @@
+@@ -1379,7 +1312,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -225,7 +223,7 @@ diff -ur php-5.6.0.orig/php.ini php-5.6.0/php.ini
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1841,7 +1773,7 @@
+@@ -1839,7 +1772,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir