X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php-ini.patch;h=7d3dbcd019aa279ad1498dd5dca3746e08c70fca;hb=63d627834d0e4e39f2d2b23b3ad6c47a9bfd72fc;hp=fa7cfe25bad68ebec0934dff6ced05943092fe8d;hpb=aef9a98d7828aeb48703ab2429a6968173d1addf;p=packages%2Fphp.git

diff --git a/php-ini.patch b/php-ini.patch
index fa7cfe2..7d3dbcd 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,17 +1,17 @@
---- 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
+--- 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
 @@ -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.
++; 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
@@ -21,16 +21,25 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Quick Reference ;
-@@ -223,7 +237,7 @@
+@@ -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 <?= shorthand tag, which can be
+ ; used regardless of this directive.
+-; Default Value: On
++; Default Value: Off
  ; Development Value: Off
  ; Production Value: Off
  ; http://php.net/short-open-tag
--short_open_tag = Off
-+short_open_tag = On
- 
- ; Allow ASP-style <% %> tags.
- ; http://php.net/asp-tags
-@@ -428,7 +428,7 @@
+@@ -371,7 +385,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 +48,16 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -804,7 +804,7 @@
+@@ -724,7 +738,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 @@
+@@ -738,53 +752,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -102,20 +111,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 @@
+@@ -862,50 +829,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -143,7 +139,6 @@
 -;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 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 +154,30 @@
 -
 -;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
++; Ideally in TLD Linux you should install appropriate php-<extension> or
 +; php-pecl-<extension> package.
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
-@@ -1235,6 +1140,9 @@
+@@ -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
++iconv.input_encoding = UTF-8
++iconv.internal_encoding = UTF-8
++iconv.output_encoding = UTF-8
+ 
+ [intl]
+ ;intl.default_locale =
+@@ -1156,6 +1081,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -181,7 +187,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 @@
+@@ -1195,6 +1123,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -191,7 +197,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 @@
+@@ -1361,7 +1292,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -200,7 +206,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1863,7 +1774,7 @@
+@@ -1834,7 +1765,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir