---- php-5.4.0alpha3/php.ini~ 2011-08-08 00:06:52.000000000 +0300
-+++ php-5.4.0alpha3/php.ini 2011-08-08 00:09:15.835275555 +0300
-@@ -223,7 +223,7 @@
+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 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
++; PLD Linux Distribution.
++;
++; It's based mainly on php.ini-production, but with some changes made with
++; security in mind (see below, consult also http://php.net/manual/en/security.php).
++;
++; Please note, that in PLD installations /etc/php/php.ini file
++; contains global settings for all SAPIs (cgi, cli, apache...),
++; and after reading this file, SAPI-specific file (/etc/php/php-cgi-fcgi.ini,
++; /etc/php/php-cli.ini, /etc/php/php-apache.ini...) is INCLUDED
++; (so you don't have to duplicate whole large file to override only
++; few options)
++
+
+ ; 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
+-;user_ini.filename =
++user_ini.filename =
+
+ ; TTL for user-defined php.ini files (time-to-live) in seconds. Default is 300 seconds (5 minutes)
+ ;user_ini.cache_ttl = 300
+@@ -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
-@@ -428,7 +428,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 ;
-@@ -804,7 +804,7 @@
+@@ -731,7 +745,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
-; extension_dir = "./"
-+extension_dir = "/usr/lib/php"
++;extension_dir = "/usr/lib/php"
; On windows:
; extension_dir = "ext"
-@@ -812,54 +812,7 @@
- ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
- ; disabled on them.
+@@ -745,53 +759,6 @@
; http://php.net/enable-dl
--enable_dl = Off
--
+ enable_dl = Off
+
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers. Left undefined, PHP turns this on by default. You can
-; turn it off here AT YOUR OWN RISK
-; will look for to know it is OK to continue execution. Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; http://php.net/cgi.redirect-status-env
--;cgi.redirect_status_env = ;
+-;cgi.redirect_status_env =
-
-; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's
-; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok
-; does not currently support this feature (03/17/2002)
-; Set to 1 if running under IIS. Default is zero.
-; http://php.net/fastcgi.impersonate
--;fastcgi.impersonate = 1;
+-;fastcgi.impersonate = 1
-
-; Disable logging through FastCGI connection. PHP's default behavior is to enable
-; this feature.
-;fastcgi.logging = 0
-
-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
--; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
--; is supported by Apache. When this option is set to 1 PHP will send
+-; use when sending HTTP response code. If set to 0, PHP sends Status: header that
+-; is supported by Apache. When this option is set to 1, PHP will send
-; RFC2616 compliant header.
-; Default is zero.
-; http://php.net/cgi.rfc2616-headers
-;cgi.rfc2616_headers = 0
-+enable_dl = Off
-
+-
;;;;;;;;;;;;;;;;
; File Uploads ;
-@@ -795,52 +795,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_exif.dll ; Must be after mbstring as it depends on it
-;extension=php_mysql.dll
-;extension=php_mysqli.dll
--;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
+-;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client
-;extension=php_openssl.dll
-;extension=php_pdo_firebird.dll
-;extension=php_pdo_mysql.dll
-;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.
-
-;extension=php_soap.dll
-;extension=php_sockets.dll
--;extension=php_sqlite.dll
-;extension=php_sqlite3.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
--;extension=php_zip.dll
+; Ideally in PLD Linux you should install appropriate php-<extension> or
+; php-pecl-<extension> package.
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
-@@ -1235,6 +1140,9 @@
+@@ -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
+-;iconv.input_encoding =
++iconv.input_encoding = UTF-8
+
+ ; Use of this INI entry is deprecated, use global internal_encoding instead.
+ ; If empty, default_charset or internal_encoding or iconv.internal_encoding is used.
+ ; The precedence is: default_charset < internal_encoding < iconv.internal_encoding
+-;iconv.internal_encoding =
++iconv.internal_encoding = UTF-8
+
+ ; Use of this INI entry is deprecated, use global output_encoding instead.
+ ; If empty, default_charset or output_encoding or iconv.output_encoding is used.
+ ; The precedence is: default_charset < output_encoding < iconv.output_encoding
+ ; To use an output encoding conversion, iconv's output handler must be set
+ ; otherwise output encoding conversion cannot be performed.
+-;iconv.output_encoding =
++iconv.output_encoding = UTF-8
+
+ [intl]
+ ;intl.default_locale =
+@@ -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
-@@ -1274,6 +1182,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 =
-@@ -1440,7 +1351,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.
-@@ -1863,7 +1774,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
-soap.wsdl_cache_dir="/tmp"
-+soap.wsdl_cache_dir="/var/run/php"
++soap.wsdl_cache_dir="/var/cache/php"
; (time to live) Sets the number of second while cached file will be used
; instead of original one.
projects / packages / php.git / blobdiff