X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-ini.patch;h=e376857fed30137090e764e643985650e0ad40b2;hb=e1d16e623cb319b6f79917b764b4ebb1a8dbf9ce;hp=fa7cfe25bad68ebec0934dff6ced05943092fe8d;hpb=aef9a98d7828aeb48703ab2429a6968173d1addf;p=packages%2Fphp.git diff --git a/php-ini.patch b/php-ini.patch index fa7cfe2..e376857 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,17 +1,18 @@ ---- php-5.3.20/php.ini 2013-01-22 23:20:03.433447006 +0200 -+++ php-5.3.20/php.ini 2013-01-22 23:20:03.433447006 +0200 +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,18 +20,36 @@ +; few options) + - ;;;;;;;;;;;;;;;;;;; - ; Quick Reference ; -@@ -223,7 +237,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 +-;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 +@@ -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 -@@ -428,7 +428,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 @@ -39,16 +58,16 @@ ;;;;;;;;;;;;;;;;;;; ; Resource Limits ; -@@ -804,7 +804,7 @@ +@@ -732,7 +746,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" -@@ -826,53 +826,6 @@ +@@ -746,53 +760,6 @@ ; http://php.net/enable-dl enable_dl = Off @@ -92,8 +111,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 @@ -102,20 +121,7 @@ ;;;;;;;;;;;;;;;; ; File Uploads ; ;;;;;;;;;;;;;;;; -@@ -876,11 +876,7 @@ - ; - ; extension=modulename.extension - ; --; For example, on Windows: --; --; extension=msql.dll --; --; ... or under UNIX: -+; For example under UNIX: - ; - ; extension=msql.so - ; -@@ -899,53 +899,8 @@ +@@ -870,49 +837,8 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -139,11 +145,9 @@ -;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_mssql.dll -;extension=php_pdo_mysql.dll -;extension=php_pdo_oci.dll -;extension=php_pdo_odbc.dll @@ -159,19 +163,40 @@ - -;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- or ++; Ideally in TLD Linux you should install appropriate php- or +; php-pecl- package. ;;;;;;;;;;;;;;;;;;; ; Module Settings ; -@@ -1235,6 +1140,9 @@ +@@ -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 +-;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 = +@@ -1176,6 +1102,9 @@ ; http://php.net/mysql.connect-timeout mysql.connect_timeout = 60 @@ -181,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 -@@ -1274,6 +1182,9 @@ +@@ -1215,6 +1144,9 @@ ; http://php.net/mysqli.default-socket mysqli.default_socket = @@ -191,7 +216,7 @@ ; Default host for mysql_connect() (doesn't apply in safe mode). ; http://php.net/mysqli.default-host mysqli.default_host = -@@ -1440,7 +1351,7 @@ +@@ -1381,7 +1313,7 @@ [browscap] ; http://php.net/browscap @@ -200,7 +225,7 @@ [Session] ; Handler used to store/retrieve data. -@@ -1863,7 +1774,7 @@ +@@ -1841,7 +1773,7 @@ ; Sets the directory name where SOAP extension will put cache files. ; http://php.net/soap.wsdl-cache-dir