summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--failed.txt2
-rw-r--r--php-fpm-www.conf15
-rw-r--r--php.spec15
3 files changed, 20 insertions, 12 deletions
diff --git a/failed.txt b/failed.txt
index 39cebe0..8cadaef 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,4 +1,4 @@
-===== 7.0.0-0.18.RC4 (2015-10-01)
+===== 7.0.0-0.18.RC5 (2015-10-15)
$ grep -r 'Tests failed' /var/lib/mock/scl70*/build.log
diff --git a/php-fpm-www.conf b/php-fpm-www.conf
index b0ad693..fc85692 100644
--- a/php-fpm-www.conf
+++ b/php-fpm-www.conf
@@ -5,6 +5,7 @@
; Per pool prefix
; It only applies on the following directives:
+; - 'access.log'
; - 'slowlog'
; - 'listen' (unixsocket)
; - 'chroot'
@@ -30,17 +31,15 @@ group = apache
; a specific port;
; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
; a specific port;
-; 'port' - to listen on a TCP socket to all IPv4 addresses on a
-; specific port;
-; '[::]:port' - to listen on a TCP socket to all addresses
+; 'port' - to listen on a TCP socket to all addresses
; (IPv6 and IPv4-mapped) on a specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
listen = 127.0.0.1:9000
; Set listen(2) backlog.
-; Default Value: 65535
-;listen.backlog = 65535
+; Default Value: 511
+;listen.backlog = 511
; Set permissions for unix socket, if one is used. In Linux, read/write
; permissions must be set in order to allow connections from a web server.
@@ -302,9 +301,13 @@ pm.max_spare_servers = 35
; %t: server time the request was received
; it can accept a strftime(3) format:
; %d/%b/%Y:%H:%M:%S %z (default)
+; The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
; %T: time the log has been written (the request has finished)
; it can accept a strftime(3) format:
; %d/%b/%Y:%H:%M:%S %z (default)
+; The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
; %u: remote user
;
; Default: "%R - %u %t \"%m %r\" %s"
@@ -375,7 +378,7 @@ slowlog = /var/log/php-fpm/www-slow.log
; exectute php code.
; Note: set an empty value to allow all extensions.
; Default Value: .php
-;security.limit_extensions = .php .php3 .php4 .php5
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
; the current environment.
diff --git a/php.spec b/php.spec
index f8b37f1..2bcff34 100644
--- a/php.spec
+++ b/php.spec
@@ -22,8 +22,8 @@
%endif
# API/ABI check
-%global apiver 20131218
-%global zendver 20141001
+%global apiver 20151012
+%global zendver 20151012
%global pdover 20150127
# Extension version
%global opcachever 7.0.6-dev
@@ -130,8 +130,8 @@
#global gh_date 20150623
#global gh_owner php
#global gh_project php-src
-%global rcver RC4
-%global rpmrel 18
+%global rcver RC5
+%global rpmrel 19
Summary: PHP scripting language for creating dynamic web sites
@@ -391,7 +391,7 @@ Provides: %{?scl_prefix}php-zlib, %{?scl_prefix}php-zlib%{?_isa}
%{?scl:Requires: %{scl}-runtime}
# For user experience, those extensions were part of php-common
Requires: %{?scl_prefix}php-json%{?_isa}
-Requires: %{?scl_prefix}php-zip%{?_isa}
+#Requires: %{?scl_prefix}php-zip%{?_isa}
%description common
The %{?scl_prefix}php-common package contains files used by both
@@ -1803,6 +1803,11 @@ fi
%changelog
+* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.19.RC5
+- Update to 7.0.0RC4
+- update php-fpm.d/www.conf comments
+- API and Zend API are now set to 20151012
+
* Wed Sep 30 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.18.RC4
- Update to 7.0.0RC4
- php-fpm: set http authorization headers