summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-11-16 10:01:56 +0100
committerRemi Collet <fedora@famillecollet.com>2014-11-16 10:01:56 +0100
commitad241fb72e7217f95c8368b635f8b1a5d53271d5 (patch)
tree2b1664caa5caf53121803c7e598842234e6d9a28 /php.spec
parent20c65a501d2a0b52397919fbd1b07f0418f1bbb9 (diff)
PHP 5.5.19 + upstream patches for php-fpm
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec16
1 files changed, 15 insertions, 1 deletions
diff --git a/php.spec b/php.spec
index b9368b5..a33ebbe 100644
--- a/php.spec
+++ b/php.spec
@@ -129,7 +129,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: 5.5.19
-Release: 1%{?dist}
+Release: 2%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -179,6 +179,9 @@ Patch47: php-5.4.9-phpinfo.patch
Patch91: php-5.3.7-oci8conf.patch
# Upstream fixes (100+)
+Patch101: php-bug68423.patch
+Patch102: php-bug68421.patch
+Patch103: php-bug68420.patch
# Security fixes (200+)
@@ -841,6 +844,9 @@ support for using the enchant library to PHP.
%patch91 -p1 -b .remi-oci8
# upstream patches
+%patch101 -p1 -b .bug68423
+%patch102 -p1 -b .bug68421
+%patch103 -p1 -b .bug68420
# security patches
@@ -1689,6 +1695,14 @@ fi
%changelog
+* Sun Nov 16 2014 Remi Collet <remi@fedoraproject.org> 5.5.19-2
+- FPM: add upstream patch for https://bugs.php.net/68421
+ access.format=R doesn't log ipv6 address
+- FPM: add upstream patch for https://bugs.php.net/68420
+ listen=9000 listens to ipv6 localhost instead of all addresses
+- FPM: add upstream patch for https://bugs.php.net/68423
+ will no longer load all pools
+
* Thu Nov 13 2014 Remi Collet <remi@fedoraproject.org> 5.5.19-1
- Update to 5.5.19
http://www.php.net/releases/5_5_19.php