---- php-5.6.0beta1/php.ini~ 2014-04-21 21:38:01.000000000 +0300
-+++ php-5.6.0beta1/php.ini 2014-04-21 21:51:47.379819417 +0300
+diff -ruN php-5.6.12.orig/php.ini php-5.6.12/php.ini
+--- php-5.6.12.orig/php.ini 2015-08-06 09:55:57.000000000 +0200
++++ php-5.6.12/php.ini 2015-08-08 09:21:30.507130679 +0200
@@ -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
+ ; much more verbose when it comes to errors. We recommend using the
+ ; development version only in development environments, as errors shown to
; application users can inadvertently leak otherwise secure information.
+;
+; This is the default settings file for new PHP installations from
+; few options)
+
- ;;;;;;;;;;;;;;;;;;;
- ; Quick Reference ;
-@@ -198,7 +212,7 @@
+ ; This is php.ini-production INI file.
+
+@@ -175,7 +189,7 @@
;user_ini.filename = ".user.ini"
; To disable this feature set this option to empty value
; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
;user_ini.cache_ttl = 300
-@@ -223,7 +237,7 @@
+@@ -199,7 +213,7 @@
; Development Value: Off
; Production Value: Off
; http://php.net/short-open-tag
; Allow ASP-style <% %> tags.
; http://php.net/asp-tags
-@@ -372,7 +372,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
;;;;;;;;;;;;;;;;;;;
; Resource Limits ;
-@@ -725,7 +725,7 @@
+@@ -731,7 +745,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
; On windows:
; extension_dir = "ext"
-@@ -760,53 +760,6 @@
+@@ -745,53 +759,6 @@
; http://php.net/enable-dl
enable_dl = Off
;;;;;;;;;;;;;;;;
; File Uploads ;
;;;;;;;;;;;;;;;;
-@@ -884,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.
;
-;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.
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
-@@ -964,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
[intl]
;intl.default_locale =
-@@ -1152,6 +1062,9 @@
+@@ -1174,6 +1101,9 @@
; http://php.net/mysql.connect-timeout
mysql.connect_timeout = 60
; 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
-@@ -1191,6 +1104,9 @@
+@@ -1213,6 +1143,9 @@
; http://php.net/mysqli.default-socket
mysqli.default_socket =
; Default host for mysql_connect() (doesn't apply in safe mode).
; http://php.net/mysqli.default-host
mysqli.default_host =
-@@ -1357,7 +1273,7 @@
+@@ -1379,7 +1312,7 @@
[browscap]
; http://php.net/browscap
-;browscap = extra/browscap.ini
-+browscap = /etc/php/browscap.ini
++;browscap = /usr/share/browscap/php_browscap.ini
[Session]
; Handler used to store/retrieve data.
-@@ -1822,7 +1738,7 @@
+@@ -1677,7 +1610,7 @@
+ [Assertion]
+ ; Assert(expr); active by default.
+ ; http://php.net/assert.active
+-;assert.active = On
++assert.active = Off
+
+ ; Issue a PHP warning for each failed assertion.
+ ; http://php.net/assert.warning
+@@ -1839,7 +1772,7 @@
; Sets the directory name where SOAP extension will put cache files.
; http://php.net/soap.wsdl-cache-dir