- update to 5.6.5RC1
- FPM: enable ACL support for Unix Domain Socket - FPM: switch default configuration to use UDS
This commit is contained in:
parent
f3a8c95c69
commit
a8ae4d1be8
1
.gitignore
vendored
1
.gitignore
vendored
@ -37,3 +37,4 @@ php-5.5.*.xz
|
||||
/php-5.6.3-strip.tar.xz
|
||||
/php-5.6.4RC1-strip.tar.xz
|
||||
/php-5.6.4-strip.tar.xz
|
||||
/php-5.6.5RC1-strip.tar.xz
|
||||
|
@ -2,5 +2,5 @@
|
||||
# network or unix domain socket configuration
|
||||
|
||||
upstream php-fpm {
|
||||
server 127.0.0.1:9000;
|
||||
server unix:/run/php-fpm/www.sock;
|
||||
}
|
||||
|
@ -36,7 +36,7 @@ group = apache
|
||||
; (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
|
||||
listen = /run/php-fpm/www.sock
|
||||
|
||||
; Set listen(2) backlog.
|
||||
; Default Value: 65535
|
||||
@ -50,6 +50,12 @@ listen = 127.0.0.1:9000
|
||||
;listen.group = nobody
|
||||
;listen.mode = 0660
|
||||
|
||||
; When POSIX Access Control Lists are supported you can set them using
|
||||
; these options, value is a comma separated list of user/group names.
|
||||
; When set, listen.owner and listen.group are ignored
|
||||
listen.acl_users = apache,nginx
|
||||
;listen.acl_groups =
|
||||
|
||||
; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
|
||||
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
|
||||
; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
|
||||
|
2
php.conf
2
php.conf
@ -45,6 +45,6 @@ DirectoryIndex index.php
|
||||
# Redirect to local php-fpm if mod_php is not available
|
||||
<IfModule !mod_php5.c>
|
||||
<FilesMatch \.php$>
|
||||
SetHandler "proxy:fcgi://127.0.0.1:9000"
|
||||
SetHandler "proxy:unix:/run/php-fpm/www.sock|fgci://localhost"
|
||||
</FilesMatch>
|
||||
</IfModule>
|
||||
|
13
php.spec
13
php.spec
@ -57,12 +57,12 @@
|
||||
%global db_devel libdb-devel
|
||||
%endif
|
||||
|
||||
#global rcver RC1
|
||||
%global rcver RC1
|
||||
|
||||
Summary: PHP scripting language for creating dynamic web sites
|
||||
Name: php
|
||||
Version: 5.6.4
|
||||
Release: 2%{?dist}
|
||||
Version: 5.6.5
|
||||
Release: 0.1.RC1%{?dist}
|
||||
# All files licensed under PHP version 3.01, except
|
||||
# Zend is licensed under Zend
|
||||
# TSRM is licensed under BSD
|
||||
@ -198,6 +198,7 @@ Summary: PHP FastCGI Process Manager
|
||||
# Zend is licensed under Zend
|
||||
# TSRM and fpm are licensed under BSD
|
||||
License: PHP and Zend and BSD
|
||||
BuildRequires: libacl-devel
|
||||
Requires: php-common%{?_isa} = %{version}-%{release}
|
||||
Requires(pre): /usr/sbin/useradd
|
||||
BuildRequires: systemd-units
|
||||
@ -994,6 +995,7 @@ popd
|
||||
# Build php-fpm
|
||||
pushd build-fpm
|
||||
build --enable-fpm \
|
||||
--with-fpm-acl \
|
||||
--with-fpm-systemd \
|
||||
--libdir=%{_libdir}/php \
|
||||
--without-mysql \
|
||||
@ -1476,6 +1478,11 @@ rm -f README.{Zeus,QNX,CVS-RULES}
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jan 9 2015 Remi Collet <remi@fedoraproject.org> 5.6.5-0.1.RC1
|
||||
- update to 5.6.5RC1
|
||||
- FPM: enable ACL support for Unix Domain Socket
|
||||
- FPM: switch default configuration to use UDS
|
||||
|
||||
* Wed Dec 17 2014 Remi Collet <remi@fedoraproject.org> 5.6.4-2
|
||||
- Update to 5.6.4 (real)
|
||||
http://www.php.net/releases/5_6_4.php
|
||||
|
Loading…
Reference in New Issue
Block a user