X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-ini.patch;h=7d03c6e0aac17e99b6ec138d722d7567866f22d9;hb=8e95d3efd3e05b2419be3a092efa3cb763c382fd;hp=7d3dbcd019aa279ad1498dd5dca3746e08c70fca;hpb=63d627834d0e4e39f2d2b23b3ad6c47a9bfd72fc;p=packages%2Fphp.git diff --git a/php-ini.patch b/php-ini.patch index 7d3dbcd..7d03c6e 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,17 +1,17 @@ ---- php-5.5.4/php.ini 2013-09-18 13:08:04.000000000 +0000 -+++ php-5.5.4/php.ini 2013-09-20 07:55:29.509891329 +0000 +--- 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 @@ -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 -+; TLD Linux. ++; 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 TLD installations /etc/php/php.ini file ++; 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 @@ -21,25 +21,25 @@ ;;;;;;;;;;;;;;;;;;; ; Quick Reference ; -@@ -157,7 +171,7 @@ - ; Production Value: 5 - - ; short_open_tag --; Default Value: On -+; Default Value: Off - ; Development Value: Off - ; Production Value: Off - -@@ -203,7 +217,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 @@ ; 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 +48,7 @@ ;;;;;;;;;;;;;;;;;;; ; Resource Limits ; -@@ -724,7 +738,7 @@ +@@ -725,7 +725,7 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir @@ -57,7 +57,7 @@ ; On windows: ; extension_dir = "ext" -@@ -738,53 +752,6 @@ +@@ -760,53 +760,6 @@ ; http://php.net/enable-dl enable_dl = Off @@ -101,8 +101,8 @@ -;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 @@ -111,7 +111,7 @@ ;;;;;;;;;;;;;;;; ; File Uploads ; ;;;;;;;;;;;;;;;; -@@ -862,50 +829,8 @@ +@@ -884,49 +837,8 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -135,8 +135,7 @@ -;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 11gR2 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 @@ -159,25 +158,35 @@ -;extension=php_tidy.dll -;extension=php_xmlrpc.dll -;extension=php_xsl.dll -+; Ideally in TLD Linux you should install appropriate php- or ++; Ideally in PLD Linux you should install appropriate php- or +; php-pecl- package. ;;;;;;;;;;;;;;;;;;; ; Module Settings ; -@@ -940,9 +865,9 @@ - ;filter.default_flags = - - [iconv] --;iconv.input_encoding = ISO-8859-1 --;iconv.internal_encoding = ISO-8859-1 --;iconv.output_encoding = ISO-8859-1 +@@ -964,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 +-;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 = -@@ -1156,6 +1081,9 @@ +@@ -1152,6 +1062,9 @@ ; http://php.net/mysql.connect-timeout mysql.connect_timeout = 60 @@ -187,7 +196,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 -@@ -1195,6 +1123,9 @@ +@@ -1191,6 +1104,9 @@ ; http://php.net/mysqli.default-socket mysqli.default_socket = @@ -197,7 +206,7 @@ ; Default host for mysql_connect() (doesn't apply in safe mode). ; http://php.net/mysqli.default-host mysqli.default_host = -@@ -1361,7 +1292,7 @@ +@@ -1357,7 +1273,7 @@ [browscap] ; http://php.net/browscap @@ -206,7 +215,7 @@ [Session] ; Handler used to store/retrieve data. -@@ -1834,7 +1765,7 @@ +@@ -1822,7 +1738,7 @@ ; Sets the directory name where SOAP extension will put cache files. ; http://php.net/soap.wsdl-cache-dir