summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-10-16 14:39:01 +0200
committerRemi Collet <fedora@famillecollet.com>2013-10-16 14:39:01 +0200
commit5a453a61ad027de9b857f27b68f85ee805b5a09f (patch)
tree8738b38473a2b83af023109b7f53e617bfcb4210
parentd9d3f72d96344c76edb33b15fb754763d6d323ff (diff)
PHP 5.4.21
-rw-r--r--php.ini22
-rw-r--r--php54.spec5
2 files changed, 18 insertions, 9 deletions
diff --git a/php.ini b/php.ini
index 30fff27..d689326 100644
--- a/php.ini
+++ b/php.ini
@@ -83,6 +83,8 @@
; development version only in development environments as errors shown to
; application users can inadvertently leak otherwise secure information.
+; This is php.ini-production INI file.
+
;;;;;;;;;;;;;;;;;;;
; Quick Reference ;
;;;;;;;;;;;;;;;;;;;
@@ -197,13 +199,12 @@
engine = On
; This directive determines whether or not PHP will recognize code between
-; <? and ?> tags as PHP source which should be processed as such. It's been
-; recommended for several years that you not use the short tag "short cut" and
-; instead to use the full <?php and ?> tag combination. With the wide spread use
-; of XML and use of these tags by other languages, the server can become easily
-; 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.
+; <? and ?> tags as PHP source which should be processed as such. It is
+; generally recommended that <?php and ?> should be used and that this feature
+; should be disabled, as enabling it may result in issues when generating XML
+; 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
; Development Value: Off
; Production Value: Off
@@ -1435,7 +1436,7 @@ session.gc_maxlifetime = 1440
; collection through a shell script, cron entry, or some other method.
; For example, the following script would is the equivalent of
; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-; find /path/to/sessions -cmin +24 | xargs rm
+; find /path/to/sessions -cmin +24 -type f | xargs rm
; PHP 4.2 and less have an undocumented feature/bug that allows you to
; to initialize a session variable in the global scope.
@@ -1792,6 +1793,11 @@ ldap.max_links = -1
[dba]
;dba.default_handler=
+[curl]
+; A default value for the CURLOPT_CAINFO option. This is required to be an
+; absolute path.
+;curl.cainfo =
+
; Local Variables:
; tab-width: 4
; End:
diff --git a/php54.spec b/php54.spec
index af23d17..d6fa04f 100644
--- a/php54.spec
+++ b/php54.spec
@@ -75,7 +75,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: php
-Version: 5.4.20
+Version: 5.4.21
%if 0%{?snapdate:1}%{?rcver:1}
Release: 0.5.%{?snapdate}%{?rcver}%{?dist}
%else
@@ -1632,6 +1632,9 @@ fi
%changelog
+* Wed Oct 16 2013 Remi Collet <rcollet@redhat.com> - 5.4.21-1
+- update to 5.4.21
+
* Wed Sep 18 2013 Remi Collet <rcollet@redhat.com> - 5.4.20-1
- update to 5.4.20