---- php-5.4.0RC3/php.ini~ 2011-12-10 03:28:54.000000000 +0200
-+++ php-5.4.0RC3/php.ini 2011-12-10 03:29:47.322573066 +0200
-@@ -223,7 +223,7 @@
+--- php-5.4.5/php.ini~ 2012-07-20 12:22:18.000000000 +0300
++++ php-5.4.5/php.ini 2012-07-20 12:32:16.646206310 +0300
+@@ -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
+ ; 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)
++
+
+ ;;;;;;;;;;;;;;;;;;;
+ ; Quick Reference ;
+@@ -223,7 +237,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 @@
+@@ -372,7 +372,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 @@
+@@ -725,7 +725,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.
+@@ -735,53 +735,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.
-; Default is zero.
-; http://php.net/cgi.rfc2616-headers
-;cgi.rfc2616_headers = 0
-+enable_dl = Off
-
+-
;;;;;;;;;;;;;;;;
; File Uploads ;
-@@ -805,52 +805,8 @@
+ ;;;;;;;;;;;;;;;;
+@@ -859,52 +812,9 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
-
-;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 @@
+ ;;;;;;;;;;;;;;;;;;;
+@@ -938,9 +848,9 @@
+ ;filter.default_flags =
+
+ [iconv]
+-;iconv.input_encoding = ISO-8859-1
+-;iconv.internal_encoding = ISO-8859-1
+-;iconv.output_encoding = ISO-8859-1
++iconv.input_encoding = UTF-8
++iconv.internal_encoding = UTF-8
++iconv.output_encoding = UTF-8
+
+ [intl]
+ ;intl.default_locale =
+@@ -1152,6 +1062,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 @@
+@@ -1191,6 +1104,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 @@
+@@ -1357,7 +1273,7 @@
[browscap]
; http://php.net/browscap
[Session]
; Handler used to store/retrieve data.
-@@ -1863,7 +1774,7 @@
+@@ -1822,7 +1738,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