From 7954582fdca3349c5d02a8afcf314795b35db8df Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 15 Sep 2014 08:42:44 +0000 Subject: [PATCH] - TLDized --- php-ini.patch | 60 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/php-ini.patch b/php-ini.patch index 7d03c6e..e376857 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,17 +1,18 @@ ---- 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 -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 @@ -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 -+; PLD Linux Distribution. ++; TLD Linux. +; +; 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 ++; Please note, that in TLD 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 @@ -19,9 +20,18 @@ +; few options) + - ;;;;;;;;;;;;;;;;;;; - ; Quick Reference ; -@@ -198,7 +212,7 @@ + ; This is php.ini-production INI file. + +@@ -149,7 +163,7 @@ + ; Production Value: 5 + + ; short_open_tag +-; Default Value: On ++; Default Value: Off + ; Development Value: Off + ; Production Value: Off + +@@ -175,7 +189,7 @@ ;user_ini.filename = ".user.ini" ; To disable this feature set this option to empty value @@ -30,16 +40,16 @@ ; 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 @@ +@@ -195,7 +209,7 @@ + ; documents, however this remains supported for backward compatibility reasons. + ; Note that this directive does not control the tags. - ; http://php.net/asp-tags -@@ -372,7 +372,7 @@ +@@ -363,7 +377,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 @@ -48,7 +58,7 @@ ;;;;;;;;;;;;;;;;;;; ; Resource Limits ; -@@ -725,7 +725,7 @@ +@@ -732,7 +746,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -57,7 +67,7 @@ ; On windows: ; extension_dir = "ext" -@@ -760,53 +760,6 @@ +@@ -746,53 +760,6 @@ ; http://php.net/enable-dl enable_dl = Off @@ -111,7 +121,7 @@ ;;;;;;;;;;;;;;;; ; File Uploads ; ;;;;;;;;;;;;;;;; -@@ -884,49 +837,8 @@ +@@ -870,49 +837,8 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -158,12 +168,12 @@ -;extension=php_tidy.dll -;extension=php_xmlrpc.dll -;extension=php_xsl.dll -+; Ideally in PLD Linux you should install appropriate php- or ++; Ideally in TLD Linux you should install appropriate php- or +; php-pecl- package. ;;;;;;;;;;;;;;;;;;; ; Module Settings ; -@@ -964,19 +876,19 @@ +@@ -950,19 +876,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 @@ -186,7 +196,7 @@ [intl] ;intl.default_locale = -@@ -1152,6 +1062,9 @@ +@@ -1176,6 +1102,9 @@ ; http://php.net/mysql.connect-timeout mysql.connect_timeout = 60 @@ -196,7 +206,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 -@@ -1191,6 +1104,9 @@ +@@ -1215,6 +1144,9 @@ ; http://php.net/mysqli.default-socket mysqli.default_socket = @@ -206,7 +216,7 @@ ; Default host for mysql_connect() (doesn't apply in safe mode). ; http://php.net/mysqli.default-host mysqli.default_host = -@@ -1357,7 +1273,7 @@ +@@ -1381,7 +1313,7 @@ [browscap] ; http://php.net/browscap @@ -215,7 +225,7 @@ [Session] ; Handler used to store/retrieve data. -@@ -1822,7 +1738,7 @@ +@@ -1841,7 +1773,7 @@ ; Sets the directory name where SOAP extension will put cache files. ; http://php.net/soap.wsdl-cache-dir -- 2.46.0