From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 19 Aug 2013 12:59:14 +0000 (+0000)
Subject: - disable short open tags by default
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=c4d0117f1cc5305d62fdeaaa425285c7e388652b;p=packages%2Fphp.git

- disable short open tags by default
- s/PLD/TLD
---

diff --git a/php-ini.patch b/php-ini.patch
index fa7cfe2..fe382e4 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.3.27/php.ini	2013-07-10 17:43:08.000000000 +0000
++++ php-5.3.27/php.ini	2013-08-19 12:57:58.840000055 +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 @@
+@@ -172,7 +186,7 @@
+ ;   Production Value: 5
+ 
+ ; short_open_tag
+-;   Default Value: On
++;   Default Value: Off
+ ;   Development Value: Off
+ ;   Production Value: Off
+ 
+@@ -219,7 +233,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
-@@ -428,7 +428,7 @@
+@@ -432,7 +446,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 ;
-@@ -804,7 +804,7 @@
+@@ -816,7 +830,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -48,7 +57,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -826,53 +826,6 @@
+@@ -826,53 +840,6 @@
  ; http://php.net/enable-dl
  enable_dl = Off
  
@@ -102,7 +111,7 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -876,11 +876,7 @@
+@@ -935,11 +902,7 @@
  ;
  ;   extension=modulename.extension
  ;
@@ -115,10 +124,11 @@
  ;
  ;   extension=msql.so
  ;
-@@ -899,53 +899,8 @@
+@@ -949,54 +912,9 @@
+ ;
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
- ;
+-;
 -; Windows Extensions
 -; Note that ODBC support is built in, so no dll is needed for it.
 -; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
@@ -166,12 +176,13 @@
 -;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 @@
+@@ -1248,6 +1166,9 @@
  ; http://php.net/mysql.connect-timeout
  mysql.connect_timeout = 60
  
@@ -181,7 +192,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 @@
+@@ -1287,6 +1208,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
  
@@ -191,7 +202,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 @@
+@@ -1453,7 +1377,7 @@
  
  [browscap]
  ; http://php.net/browscap
@@ -200,7 +211,7 @@
  
  [Session]
  ; Handler used to store/retrieve data.
-@@ -1863,7 +1774,7 @@
+@@ -1875,7 +1799,7 @@
  
  ; Sets the directory name where SOAP extension will put cache files.
  ; http://php.net/soap.wsdl-cache-dir