From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 19 Aug 2013 09:56:48 +0000 (+0000)
Subject: - disable short open tags by default, they're used for XML and XML doesn't
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=ec1cfa626b9a9502ee75e3ddf1d44086af0f1af9;p=packages%2Fphp.git

- disable short open tags by default, they're used for XML and XML doesn't
  parse well as PHP
- s/PLD/TLD
---

diff --git a/php-ini.patch b/php-ini.patch
index c651cf6..00720c3 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,17 +1,17 @@
---- 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
+--- php-5.5.2/php.ini	2013-08-15 20:42:04.000000000 +0000
++++ php-5.5.2/php.ini	2013-08-19 08:38:00.942999606 +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
+ 
+@@ -204,7 +218,7 @@
+ ; confused and end up parsing the wrong code in the wrong context. But because
+ ; this short cut has been a feature for such a long time, it's currently still
+ ; supported for backwards compatibility, but we recommend you don't use them.
+-; 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
-@@ -372,7 +372,7 @@
+@@ -372,7 +386,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,7 +48,7 @@
  
  ;;;;;;;;;;;;;;;;;;;
  ; Resource Limits ;
-@@ -725,7 +725,7 @@
+@@ -725,7 +739,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -48,7 +57,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -735,53 +735,6 @@
+@@ -739,53 +753,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -102,7 +111,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -859,52 +812,9 @@
+@@ -863,50 +830,9 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -150,15 +159,13 @@
 -;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 ;
- ;;;;;;;;;;;;;;;;;;;
-@@ -938,9 +848,9 @@
+@@ -941,9 +867,9 @@
  ;filter.default_flags =
  
  [iconv]
@@ -171,7 +178,7 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1152,6 +1062,9 @@
+@@ -1157,6 +1083,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -181,7 +188,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 @@
+@@ -1196,6 +1125,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -191,7 +198,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 @@
+@@ -1362,7 +1294,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -200,7 +207,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1822,7 +1738,7 @@
+@@ -1827,7 +1759,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir