summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-10-03 08:15:09 +0200
committerRemi Collet <fedora@famillecollet.com>2014-10-03 08:15:09 +0200
commit881846fdaff3b5efb55212ca055332c115dd593c (patch)
tree6ec17742517e59a4aac01efdc9ef9dffee6d34b8
parentc9ba46a289eaab98ca7b38dc79d39387da33ff97 (diff)
PHP 5.6.1
-rw-r--r--php.ini3
-rw-r--r--php56.spec6
2 files changed, 7 insertions, 2 deletions
diff --git a/php.ini b/php.ini
index 42e85a5..b462a9d 100644
--- a/php.ini
+++ b/php.ini
@@ -1681,6 +1681,7 @@ mssql.secure_connection = Off
; The precedence is: default_charset < output_encoding < mbstring.http_output
; To use an output encoding conversion, mbstring's output handler must be set
; otherwise output encoding conversion cannot be performed.
+; http://php.net/mbstring.http-output
;mbstring.http_output =
; enable automatic encoding translation according to
@@ -1692,7 +1693,7 @@ mssql.secure_connection = Off
;mbstring.encoding_translation = Off
; automatic encoding detection order.
-; "auto" detect order is changed accoding to mbstring.language
+; "auto" detect order is changed according to mbstring.language
; http://php.net/mbstring.detect-order
;mbstring.detect_order = auto
diff --git a/php56.spec b/php56.spec
index d94cf4e..eacc0f3 100644
--- a/php56.spec
+++ b/php56.spec
@@ -135,7 +135,7 @@ Version: 5.6.1
%if 0%{?snapdate:1}%{?rcver:1}
Release: 0.2.%{?snapdate}%{?rcver}%{?dist}
%else
-Release: 0.3%{?dist}
+Release: 1%{?dist}
%endif
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -1945,6 +1945,10 @@ fi
%changelog
+* Fri Oct 3 2014 Remi Collet <remi@fedoraproject.org> 5.6.1-1
+- Update to PHP 5.6.1
+ http://php.net/releases/5_6_1.php
+
* Fri Sep 26 2014 Remi Collet <rcollet@redhat.com> 5.6.1-0
- test build for upcoming 5.6.1
- use default system cipher list by Fedora policy