Joe Watkins 8961c78524 Merge branch 'PHP-7.0' into PHP-7.1 ... * PHP-7.0: improve FPM tests (mostly for systemd build)		2017-01-08 19:03:10 +00:00
..
fpm	Merge branch 'PHP-7.0' into PHP-7.1	2017-01-07 22:54:16 +01:00
tests	improve FPM tests (mostly for systemd build)	2017-01-08 19:02:50 +00:00
config.m4	Merge branch 'PHP-5.6' into PHP-7.0	2015-11-23 18:56:13 +02:00
CREDITS
init.d.php-fpm.in	Add configtest option to fpm init.d script	2015-03-08 22:48:29 +08:00
LICENSE
Makefile.frag	Merge branch 'PHP-5.6' into PHP-7.0	2016-02-08 20:29:24 +02:00
php-fpm.8.in	Happy new year (Update copyright to 2016)	2016-01-03 01:44:37 +02:00
php-fpm.conf.in	Fix some typos in PHP FPM configuration	2016-08-15 22:50:14 +02:00
php-fpm.service.in	Merge branch 'PHP-7.0' into PHP-7.1	2017-01-05 06:54:37 +00:00
status.html.in	- fix r317913	2011-10-08 20:43:12 +00:00
www.conf.in	Fix minor typo	2016-12-03 14:15:52 +01:00